You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/05/21 16:37:06 UTC

[03/10] flex-asjs git commit: mainClass parameter was hiding mainClass property and uncovered a bug were mainClass wasn’t being set on the JS side but being used in getInstance

mainClass parameter was hiding mainClass property and uncovered a bug were mainClass wasn’t being set on the JS side but being used in getInstance


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

Branch: refs/heads/develop
Commit: 1ec54127741317a9a0506d674d9cfde5c2a18a05
Parents: 004d204
Author: Justin Mclean <jm...@apache.org>
Authored: Sun May 21 07:03:00 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun May 21 07:03:00 2017 +1000

----------------------------------------------------------------------
 .../flex/org/apache/flex/core/SimpleCSSValuesImpl.as     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ec54127/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
index 391d54d..dd8b88a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as
@@ -74,14 +74,14 @@ package org.apache.flex.core
          *  @productversion FlexJS 0.0
          */
         COMPILE::SWF
-        public function init(mainClass:Object):void
+        public function init(main:Object):void
         {
 			var styleClassName:String;
 			var c:Class;
 			if (!values)
 			{
 				values = {};
-	            this.mainClass = mainClass;
+	            this.mainClass = main;
 	            var mainClassName:String = getQualifiedClassName(mainClass);
 				styleClassName = "_" + mainClassName + "_Styles";
 				c = ApplicationDomain.currentDomain.getDefinition(styleClassName) as Class;
@@ -107,10 +107,13 @@ package org.apache.flex.core
         }
         
         COMPILE::JS
-        public function init(mainClass:Object):void
+        public function init(main:Object):void
         {
-            var cssData:Array = mainClass.cssData;
+            var cssData:Array = main.cssData;
             var values:Object = this.values;
+
+            this.mainClass = main;
+
             if (values == null)
                 values = {};