You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/06/23 23:40:54 UTC
[1/3] git commit: [flex-asjs] [refs/heads/develop] - make sure
airglobal is on external-library-path
Repository: flex-asjs
Updated Branches:
refs/heads/develop 20d474bd3 -> 32f305337
make sure airglobal is on external-library-path
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/65fe8ce1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/65fe8ce1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/65fe8ce1
Branch: refs/heads/develop
Commit: 65fe8ce1cb9138af3a8d92fa012c1f28b264768c
Parents: 20d474b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 23 15:30:08 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 23 15:30:22 2016 -0700
----------------------------------------------------------------------
frameworks/projects/Binding/pom.xml | 2 +-
frameworks/projects/Charts/pom.xml | 2 +-
frameworks/projects/Collections/pom.xml | 2 +-
frameworks/projects/Core/pom.xml | 2 +-
frameworks/projects/CreateJS/pom.xml | 2 +-
frameworks/projects/DragDrop/pom.xml | 2 +-
frameworks/projects/Effects/pom.xml | 2 +-
frameworks/projects/Flat/pom.xml | 2 +-
frameworks/projects/Formatters/pom.xml | 2 +-
frameworks/projects/GoogleMaps/pom.xml | 2 +-
frameworks/projects/Graphics/pom.xml | 2 +-
frameworks/projects/HTML/pom.xml | 2 +-
frameworks/projects/HTML5/pom.xml | 2 +-
frameworks/projects/JQuery/pom.xml | 2 +-
frameworks/projects/Mobile/pom.xml | 2 +-
frameworks/projects/Network/pom.xml | 2 +-
frameworks/projects/Reflection/pom.xml | 2 +-
frameworks/projects/Storage/pom.xml | 2 +-
frameworks/projects/XML/pom.xml | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Binding/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml
index 81501d8..bff11f2 100644
--- a/frameworks/projects/Binding/pom.xml
+++ b/frameworks/projects/Binding/pom.xml
@@ -71,7 +71,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Charts/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index c66af68..8578b3f 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/pom.xml
@@ -77,7 +77,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Collections/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml
index f7177ec..bab9e75 100644
--- a/frameworks/projects/Collections/pom.xml
+++ b/frameworks/projects/Collections/pom.xml
@@ -73,7 +73,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Core/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml
index 722316a..4683329 100644
--- a/frameworks/projects/Core/pom.xml
+++ b/frameworks/projects/Core/pom.xml
@@ -74,7 +74,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/CreateJS/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index 622fc23..a27ec73 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/pom.xml
@@ -77,7 +77,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/DragDrop/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml
index 0b135b1..bb96038 100644
--- a/frameworks/projects/DragDrop/pom.xml
+++ b/frameworks/projects/DragDrop/pom.xml
@@ -73,7 +73,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Effects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index f6f96f0..b6d485b 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -73,7 +73,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index ce5cf0a..729c34d 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -83,7 +83,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Formatters/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index 0f0172c..433f4e8 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -73,7 +73,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index 3f66340..fa0af9c 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -78,7 +78,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Graphics/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml
index 7685c86..25710fc 100644
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@ -73,7 +73,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index e3ef8cc..82fa8c3 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -86,7 +86,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/HTML5/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml
index 5745e6a..5ba9ca1 100644
--- a/frameworks/projects/HTML5/pom.xml
+++ b/frameworks/projects/HTML5/pom.xml
@@ -77,7 +77,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/JQuery/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml
index 59b52f2..09443e9 100644
--- a/frameworks/projects/JQuery/pom.xml
+++ b/frameworks/projects/JQuery/pom.xml
@@ -77,7 +77,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Mobile/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml
index 855b800..338e84e 100644
--- a/frameworks/projects/Mobile/pom.xml
+++ b/frameworks/projects/Mobile/pom.xml
@@ -81,7 +81,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Network/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/pom.xml b/frameworks/projects/Network/pom.xml
index 0aa187a..33dcb93 100644
--- a/frameworks/projects/Network/pom.xml
+++ b/frameworks/projects/Network/pom.xml
@@ -73,7 +73,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Reflection/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/pom.xml b/frameworks/projects/Reflection/pom.xml
index f2ce15b..c158585 100644
--- a/frameworks/projects/Reflection/pom.xml
+++ b/frameworks/projects/Reflection/pom.xml
@@ -65,7 +65,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/Storage/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml
index 2f68998..6fa81bc 100644
--- a/frameworks/projects/Storage/pom.xml
+++ b/frameworks/projects/Storage/pom.xml
@@ -77,7 +77,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65fe8ce1/frameworks/projects/XML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml
index 73566fc..e6450a7 100644
--- a/frameworks/projects/XML/pom.xml
+++ b/frameworks/projects/XML/pom.xml
@@ -71,7 +71,7 @@
<artifactId>airglobal</artifactId>
<version>${air.version}</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>external</scope>
</dependency>
<dependency>
[3/3] git commit: [flex-asjs] [refs/heads/develop] - fix error handler
Posted by ah...@apache.org.
fix error handler
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/32f30533
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/32f30533
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/32f30533
Branch: refs/heads/develop
Commit: 32f305337422b010f07ee63ec4328ce2d9b28c1f
Parents: 57a63b0
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 23 16:22:40 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 23 16:22:40 2016 -0700
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/core/CSSFontFaceBead.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/32f30533/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSFontFaceBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSFontFaceBead.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSFontFaceBead.as
index dfae721..ef54d9e 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSFontFaceBead.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSFontFaceBead.as
@@ -131,7 +131,7 @@ package org.apache.flex.core
COMPILE::SWF
private function errorHandler(event:flash.events.Event):void
{
- trace("error loading font from: ", event.target.name);
+ trace("error loading font from: ", event.target.loader.name);
removeTarget(event.target);
}
[2/3] git commit: [flex-asjs] [refs/heads/develop] - fix as example
Posted by ah...@apache.org.
fix as example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/57a63b03
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/57a63b03
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/57a63b03
Branch: refs/heads/develop
Commit: 57a63b038228c1d757dc355a6a636fdce7ae7acb
Parents: 65fe8ce
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 23 16:14:54 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 23 16:14:54 2016 -0700
----------------------------------------------------------------------
.../src/DataBindingExample.as | 30 ++++++++++++++++----
1 file changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/57a63b03/examples/flexjs/DataBindingExample_as/src/DataBindingExample.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/src/DataBindingExample.as b/examples/flexjs/DataBindingExample_as/src/DataBindingExample.as
index d89b6f1..95609cd 100644
--- a/examples/flexjs/DataBindingExample_as/src/DataBindingExample.as
+++ b/examples/flexjs/DataBindingExample_as/src/DataBindingExample.as
@@ -44,15 +44,19 @@ import org.apache.flex.html.beads.controllers.DropDownListController;
import org.apache.flex.html.beads.controllers.ItemRendererMouseController;
import org.apache.flex.html.beads.controllers.EditableTextKeyboardController;
import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController;
+import org.apache.flex.html.beads.layouts.BasicLayout;
import org.apache.flex.html.beads.layouts.VerticalLayout;
import org.apache.flex.html.beads.models.ArraySelectionModel;
import org.apache.flex.html.beads.models.SingleLineBorderModel;
import org.apache.flex.html.beads.models.TextModel;
import org.apache.flex.html.beads.models.ToggleButtonModel;
import org.apache.flex.html.beads.models.ValueToggleButtonModel;
+import org.apache.flex.html.beads.models.ViewportModel;
+import org.apache.flex.html.supportClasses.ContainerContentArea;
import org.apache.flex.html.supportClasses.DropDownListList;
import org.apache.flex.html.supportClasses.DataGroup;
import org.apache.flex.html.supportClasses.ScrollingViewport;
+import org.apache.flex.html.supportClasses.Viewport;
import org.apache.flex.html.supportClasses.StringItemRenderer;
import org.apache.flex.net.HTTPService;
import org.apache.flex.collections.parsers.JSONInputParser;
@@ -105,9 +109,23 @@ public class DataBindingExample extends Application
o = viv[makeDefinitionName("org.apache.flex.html::Container")] =
{
- iBeadView: ContainerView
+ iBeadView: ContainerView,
+ iBeadLayout: BasicLayout,
+ iContentView: ContainerContentArea,
+ iViewport: Viewport,
+ iViewportModel: ViewportModel
};
+ o = viv[makeDefinitionName("org.apache.flex.core::View")] =
+ {
+
+ iBeadView: ContainerView,
+ iBeadLayout: BasicLayout,
+ iContentView: ContainerContentArea,
+ iViewport: Viewport,
+ iViewportModel: ViewportModel
+ };
+
CONFIG::as_only {
o.iBackgroundBead = SolidBackgroundBead;
o.iBorderBead = SingleLineBorderBead;
@@ -119,9 +137,10 @@ public class DataBindingExample extends Application
iBeadView: ListView,
iBeadController: ListSingleSelectionMouseController,
iBeadLayout: VerticalLayout,
- iDataGroup: DataGroup,
+ iContentView: DataGroup,
iDataProviderItemRendererMapper: DataItemRendererFactoryForArrayData,
- IViewport: ScrollingViewport,
+ iViewport: ScrollingViewport,
+ iViewportModel: ViewportModel,
iItemRendererClassFactory: ItemRendererClassFactory,
iItemRenderer: StringItemRenderer
};
@@ -243,9 +262,10 @@ public class DataBindingExample extends Application
iBeadView: ListView,
iBeadController: ListSingleSelectionMouseController,
iBeadLayout: VerticalLayout,
- iDataGroup: DataGroup,
+ iContentView: DataGroup,
iDataProviderItemRendererMapper: TextItemRendererFactoryForArrayData,
- IViewport: ScrollingViewport,
+ iViewport: ScrollingViewport,
+ iViewportModel: ViewportModel,
iItemRendererClassFactory: ItemRendererClassFactory,
iItemRenderer: StringItemRenderer
}