flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1422148 - in /incubator/flex/sdk/branches/develop: ./ frameworks/projects/framework/src/mx/core/UITextField.as frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
Date Fri, 14 Dec 2012 23:31:07 GMT
Author: aharui
Date: Fri Dec 14 23:31:06 2012
New Revision: 1422148

URL: http://svn.apache.org/viewvc?rev=1422148&view=rev
Log:
merge rev 1422140 to develop branch

Modified:
    incubator/flex/sdk/branches/develop/   (props changed)
    incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
  (props changed)
    incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as

Propchange: incubator/flex/sdk/branches/develop/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9:r1422140

Propchange: incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/core/UITextField.as:r1422140
  Merged /incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/frameworks/projects/framework/src/mx/core/UITextField.as:r1422140

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as?rev=1422148&r1=1422147&r2=1422148&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
Fri Dec 14 23:31:06 2012
@@ -90,13 +90,13 @@ public class StyleManagerImpl extends Ev
 	 */
 	public static function init(fbs:IFlexModuleFactory):void
 	{
-		var sm:StyleManagerImpl = fbs.getImplementation("mx.styles::IStyleManager2") as StyleManagerImpl;
-		if (!sm)
-			sm = new StyleManagerImpl(fbs);
-		
 		var styleDataClassName:String = fbs.info()["styleDataClassName"];
 		if (styleDataClassName)
 		{
+			var sm:StyleManagerImpl = fbs.getImplementation("mx.styles::IStyleManager2") as StyleManagerImpl;
+			if (!sm)
+				sm = new StyleManagerImpl(fbs);
+			
 			var styleDataClass:Class = fbs.info()["currentDomain"].getDefinition(styleDataClassName);
 			var styleNames:Array = styleDataClass["inheritingStyles"];
 			for each (var s:String in styleNames)
@@ -1759,7 +1759,7 @@ public class StyleManagerImpl extends Ev
 		{
 			timer.removeEventListener(TimerEvent.TIMER, timerHandler);
 			timer.stop();
-			module.load(applicationDomain, securityDomain);
+			module.load(applicationDomain, securityDomain, null, moduleFactory);
 		};
 		
 		timer.addEventListener(TimerEvent.TIMER, timerHandler, false, 0, true);



Mime
View raw message