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 2017/02/22 08:26:36 UTC
[1/2] git commit: [flex-asjs] [refs/heads/dual] - forgot these
Repository: flex-asjs
Updated Branches:
refs/heads/dual aaf81f665 -> 7ac384eb6
forgot these
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fa477876
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa477876
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa477876
Branch: refs/heads/dual
Commit: fa477876520b6b3161ed11f9b56cbf0f24768c10
Parents: aaf81f6
Author: Alex Harui <ah...@apache.org>
Authored: Tue Feb 21 23:59:27 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Feb 21 23:59:27 2017 -0800
----------------------------------------------------------------------
frameworks/projects/Basic/src/main/flex/BasicClasses.as | 2 ++
.../flex/org/apache/flex/html/beads/models/BinaryImageModel.as | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa477876/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index fca4ee2..f43c962 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -58,6 +58,8 @@ internal class BasicClasses
import org.apache.flex.html.beads.ImageView; org.apache.flex.html.beads.ImageView;
}
import org.apache.flex.html.beads.ImageButtonView; ImageButtonView;
+ import org.apache.flex.html.beads.BinaryImageLoader; BinaryImageLoader;
+ import org.apache.flex.html.beads.models.BinaryImageModel; BinaryImageModel;
import org.apache.flex.html.beads.ListView; ListView;
COMPILE::SWF
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa477876/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
index 1ec5372..eb5cf59 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
@@ -52,7 +52,7 @@ package org.apache.flex.html.beads.models
override public function set url(value:String):void
{
- if (value && value != _url)
+ if (value && value != url)
_binary = null;
super.url = value;
@@ -78,7 +78,7 @@ package org.apache.flex.html.beads.models
if (value != _binary) {
_binary = value;
if(value)
- _url = "";
+ url = "";
dispatchEvent( new Event("binaryChanged") );
}
}
[2/2] git commit: [flex-asjs] [refs/heads/dual] - fix asdoc
Posted by ah...@apache.org.
fix asdoc
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7ac384eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7ac384eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7ac384eb
Branch: refs/heads/dual
Commit: 7ac384eb678a5f059426009afeb30a12c3e0d6e4
Parents: fa47787
Author: Alex Harui <ah...@apache.org>
Authored: Tue Feb 21 23:59:40 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Feb 21 23:59:40 2017 -0800
----------------------------------------------------------------------
.../flexjs/ASDoc/src/main/config/asdoc-config.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7ac384eb/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
index 9c856e6..4bc37a9 100644
--- a/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
+++ b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
@@ -62,6 +62,7 @@
<path-element>${frameworks_dir}/projects/Formatters/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/Graphics/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/Basic/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/HTML/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/HTML5/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/JQuery/src/main/flex</path-element>
@@ -96,6 +97,12 @@
</include-libraries>
-->
+ <allow-subclass-overrides>true</allow-subclass-overrides>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
@@ -105,6 +112,10 @@
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>${frameworks_dir}/projects/Basic/src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
<manifest>${frameworks_dir}/projects/Binding/src/main/resources/basic-manifest.xml</manifest>
</namespace>
<namespace>
@@ -165,7 +176,7 @@
</namespace>
<namespace>
<uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>${frameworks_dir}/projects/HTML/src/main/resources/svg-manifest.xml</manifest>
+ <manifest>${frameworks_dir}/projects/Basic/src/main/resources/svg-manifest.xml</manifest>
</namespace>
</namespaces>
@@ -461,6 +472,7 @@
<path-element>${frameworks_dir}/projects/Formatters/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/GoogleMaps/src/main/flex/org</path-element>
<path-element>${frameworks_dir}/projects/Graphics/src/main/flex</path-element>
+ <path-element>${frameworks_dir}/projects/Basic/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/HTML/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/HTML5/src/main/flex</path-element>
<path-element>${frameworks_dir}/projects/JQuery/src/main/flex</path-element>