Author: aharui
Date: Fri Dec 14 23:12:35 2012
New Revision: 1422140
URL: http://svn.apache.org/viewvc?rev=1422140&view=rev
Log:
Fix regression from new styles-as-data. It appears that StyleModules don't
actually use their own StyleManager to host their styles.
Modified:
incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
Modified:
incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as?rev=1422140&r1=1422139&r2=1422140&view=diff
==============================================================================
---
incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
(original)
+++
incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/styles/StyleManagerImpl.as
Fri Dec 14 23:12:35 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);
