flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-asjs] [refs/heads/dual] - sync up a change to UIHTMLWrapper
Date Tue, 25 Apr 2017 03:58:50 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/dual 086505252 -> 8d8ba2f25


sync up a change to UIHTMLWrapper


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8d8ba2f2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8d8ba2f2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8d8ba2f2

Branch: refs/heads/dual
Commit: 8d8ba2f256ee6b4287d6b455ac654457f8b976d9
Parents: 0865052
Author: Alex Harui <aharui@apache.org>
Authored: Mon Apr 24 20:58:42 2017 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Apr 24 20:58:42 2017 -0700

----------------------------------------------------------------------
 .../src/main/flex/org/apache/flex/core/HTMLElementWrapper.as | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8d8ba2f2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
index 6ba908d..d67686e 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
@@ -108,7 +108,7 @@ package org.apache.flex.core
         /**
          * allow access from overrides
          */
-		protected var _model:IBeadModel;
+		protected var _model:Object;
         
         /**
          * @flexjsignorecoercion Class 
@@ -127,11 +127,15 @@ package org.apache.flex.core
             return _model;
         }
         
+        [Bindable("modelChanged")]
         public function set model(value:Object):void
         {
             if (_model != value)
             {
-                addBead(value as IBead);
+                if (value is IBead)
+                    addBead(value as IBead);
+                else
+                    _model = value;
                 dispatchEvent(new org.apache.flex.events.Event("modelChanged"));
             }
         }


Mime
View raw message