This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 3af36ecda23736d7961ff101dd8968cd89f92759 Author: Alex Harui <[email protected]> AuthorDate: Mon Oct 1 17:49:47 2018 -0700 Jewel needs more sophisticated CSS handling for SWF side --- .../main/royale/org/apache/royale/jewel/Application.as | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as index 2b4afe2..c878138 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as @@ -29,7 +29,7 @@ package org.apache.royale.jewel import org.apache.royale.core.IInitialViewApplication; import org.apache.royale.core.IPopUpHost; import org.apache.royale.core.IRenderedObject; - import org.apache.royale.core.SimpleCSSValuesImpl; + import org.apache.royale.core.AllCSSValuesImpl; import org.apache.royale.core.IBead; import org.apache.royale.core.ILayoutChild; import org.apache.royale.core.ValuesManager; @@ -109,7 +109,7 @@ package org.apache.royale.jewel * Jewel Application holds specific Jewel need in a Royale Application. * * This class extends the standard Application and sets up the - * SimpleCSSValuesImpl (implementation) for convenience. + * AllCSSValuesImpl (implementation) for convenience. * * The Application class is the main class and entry point for a Royale * application. This Application class is different than the @@ -154,7 +154,7 @@ package org.apache.royale.jewel element.className = 'Application'; } - this.valuesImpl = new SimpleCSSValuesImpl(); + this.valuesImpl = new AllCSSValuesImpl(); } protected var instanceParent:IParent = null; @@ -241,9 +241,9 @@ package org.apache.royale.jewel * The org.apache.royale.core.IValuesImpl that will * determine the default values and other values * for the application. The most common choice - * is org.apache.royale.core.SimpleCSSValuesImpl. + * is org.apache.royale.core.AllCSSValuesImpl. * - * @see org.apache.royale.core.SimpleCSSValuesImpl + * @see org.apache.royale.core.AllCSSValuesImpl * * @langversion 3.0 * @playerversion Flash 10.2 @@ -252,8 +252,11 @@ package org.apache.royale.jewel */ public function set valuesImpl(value:IValuesImpl):void { - ValuesManager.valuesImpl = value; - ValuesManager.valuesImpl.init(this); + if (!ValuesManager.valuesImpl) + { + ValuesManager.valuesImpl = value; + ValuesManager.valuesImpl.init(this); + } } private var _initialView:IApplicationView;
