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 2015/12/01 21:23:14 UTC
[1/2] git commit: [flex-asjs] [refs/heads/core_js_to_as] - fix
ImageAndTextButton
Repository: flex-asjs
Updated Branches:
refs/heads/core_js_to_as eb92af671 -> 970554993
fix ImageAndTextButton
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a4a58ae1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a4a58ae1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a4a58ae1
Branch: refs/heads/core_js_to_as
Commit: a4a58ae1d8308bd96d364c96b7a2d4d5c8106ea8
Parents: eb92af6
Author: Alex Harui <ah...@apache.org>
Authored: Tue Dec 1 11:59:39 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Dec 1 11:59:39 2015 -0800
----------------------------------------------------------------------
.../HTML/as/src/org/apache/flex/html/ImageAndTextButton.as | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a4a58ae1/frameworks/projects/HTML/as/src/org/apache/flex/html/ImageAndTextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/ImageAndTextButton.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/ImageAndTextButton.as
index dd88427..8bdcc6a 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/ImageAndTextButton.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/ImageAndTextButton.as
@@ -53,6 +53,15 @@ package org.apache.flex.html
* @private
*/
COMPILE::JS
+ override public function get text():String
+ {
+ return ImageAndTextModel(model).text;
+ }
+
+ /**
+ * @private
+ */
+ COMPILE::JS
override public function set text(value:String):void
{
ImageAndTextModel(model).text = value;
[2/2] git commit: [flex-asjs] [refs/heads/core_js_to_as] - fix image
loading on the SWF side
Posted by ah...@apache.org.
fix image loading on the SWF side
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/97055499
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/97055499
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/97055499
Branch: refs/heads/core_js_to_as
Commit: 9705549935493d55f661c8978f5ce29ac625a63c
Parents: a4a58ae
Author: Alex Harui <ah...@apache.org>
Authored: Tue Dec 1 12:23:04 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Dec 1 12:23:04 2015 -0800
----------------------------------------------------------------------
.../projects/HTML/as/src/org/apache/flex/html/beads/ImageView.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/97055499/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ImageView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ImageView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ImageView.as
index 042634a..9c4875c 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ImageView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ImageView.as
@@ -90,7 +90,7 @@ package org.apache.flex.html.beads
_model = value.getBeadByType(IImageModel) as IImageModel;
_model.addEventListener("urlChanged",handleUrlChange);
-// handleUrlChange(null);
+ handleUrlChange(null);
}
/**