Tweaked StyleUtil.setStyleDeclaration() to hide Flex 3.x vs Flex 4.x …

…differences. Updated all default style static initializers to reflect Flex 4.x requirements (specify fully qualified class name).
CC-Archived · Dec 27, 2011 · e0c0513 · e0c0513
1 parent d9228e8
commit e0c0513
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/bin/flex-extensions.swc b/bin/flex-extensions.swc
diff --git a/src/com/codecatalyst/component/chart/control/ChartPanControl.as b/src/com/codecatalyst/component/chart/control/ChartPanControl.as
@@ -74,7 +74,7 @@ package com.codecatalyst.component.chart.control
 
 		protected static function initializeStyles():Boolean
 		{
-			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "ChartPanControl" ) || new CSSStyleDeclaration();
+			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "com.codecatalyst.component.chart.control.ChartPanControl" ) || new CSSStyleDeclaration();
 
 			declaration.defaultFactory = 
 				function ():void
@@ -85,7 +85,7 @@ package com.codecatalyst.component.chart.control
 					this.rollOverCursorOffset   = DEFAULT_PAN_CURSOR_OFFSET;
 				};
 
-			StyleUtil.setStyleDeclaration( "ChartPanControl", declaration, false );
+			StyleUtil.setStyleDeclaration( "com.codecatalyst.component.chart.control.ChartPanControl", declaration, false );
 
 			return true;
 		}

diff --git a/src/com/codecatalyst/component/chart/control/ChartZoomInControl.as b/src/com/codecatalyst/component/chart/control/ChartZoomInControl.as
@@ -84,7 +84,7 @@ package com.codecatalyst.component.chart.control
 
 		protected static function initializeStyles():Boolean
 		{
-			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "ChartZoomInControl" ) || new CSSStyleDeclaration();
+			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "com.codecatalyst.component.chart.control.ChartZoomInControl" ) || new CSSStyleDeclaration();
 
 			declaration.defaultFactory = 
 				function ():void
@@ -95,7 +95,7 @@ package com.codecatalyst.component.chart.control
 					this.rollOverCursorOffset 	= DEFAULT_ZOOM_IN_CURSOR_OFFSET;
 				};
 
-			StyleUtil.setStyleDeclaration( "ChartZoomInControl", declaration, false );
+			StyleUtil.setStyleDeclaration( "com.codecatalyst.component.chart.control.ChartZoomInControl", declaration, false );
 
 			return true;
 		}

diff --git a/src/com/codecatalyst/component/chart/control/ChartZoomOutControl.as b/src/com/codecatalyst/component/chart/control/ChartZoomOutControl.as
@@ -63,7 +63,7 @@ package com.codecatalyst.component.chart.control
 
 		protected static function initializeStyles():Boolean
 		{
-			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "ChartZoomOutControl" ) || new CSSStyleDeclaration();
+			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "com.codecatalyst.component.chart.control.ChartZoomOutControl" ) || new CSSStyleDeclaration();
 
 			declaration.defaultFactory = 
 				function ():void
@@ -74,7 +74,7 @@ package com.codecatalyst.component.chart.control
 					this.rollOverCursorOffset 	= DEFAULT_ZOOM_OUT_CURSOR_OFFSET;
 				};
 
-			StyleUtil..setStyleDeclaration( "ChartZoomOutControl", declaration, false );
+			StyleUtil..setStyleDeclaration( "com.codecatalyst.component.chart.control.ChartZoomOutControl", declaration, false );
 
 			return true;
 		}

diff --git a/src/com/codecatalyst/component/date/DateRangeSlider.as b/src/com/codecatalyst/component/date/DateRangeSlider.as
@@ -204,7 +204,7 @@ package com.codecatalyst.component.date
 
 		protected static function initializeStyles():Boolean
 		{
-			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "DateRangeSlider" ) || new CSSStyleDeclaration();
+			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "com.codecatalyst.component.date.DateRangeSlider" ) || new CSSStyleDeclaration();
 
 			declaration.defaultFactory = 
 				function ():void
@@ -226,7 +226,7 @@ package com.codecatalyst.component.date
 					this.resizeMouseUpCursorOffset          = DEFAULT_RESIZE_CURSOR_OFFSET;
 				};
 
-			StyleUtil.setStyleDeclaration( "DateRangeSlider", declaration, false );
+			StyleUtil.setStyleDeclaration( "com.codecatalyst.component.date.DateRangeSlider", declaration, false );
 
 			return true;
 		}

diff --git a/src/com/codecatalyst/component/template/MasterDetail.as b/src/com/codecatalyst/component/template/MasterDetail.as
@@ -382,7 +382,7 @@ package com.codecatalyst.component.template
 
 		protected static function initializeStyles():Boolean
 		{
-			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "MasterDetail" ) || new CSSStyleDeclaration();
+			var declaration:CSSStyleDeclaration = StyleUtil.getStyleDeclaration( "com.codecatalyst.component.date.MasterDetail" ) || new CSSStyleDeclaration();
 
 			declaration.defaultFactory = 
 				function ():void
@@ -391,7 +391,7 @@ package com.codecatalyst.component.template
 					this.verticalScrollPolicy   = ScrollPolicy.OFF;
 				};
 
-			StyleUtil.setStyleDeclaration( "MasterDetail", declaration, false );
+			StyleUtil.setStyleDeclaration( "com.codecatalyst.component.date.MasterDetail", declaration, false );
 
 			return true;
 		}

diff --git a/src/com/codecatalyst/util/StyleUtil.as b/src/com/codecatalyst/util/StyleUtil.as
@@ -41,6 +41,8 @@ package com.codecatalyst.util
 		/**
 		 * Gets the CSSStyleDeclaration object that stores the rules for the specified CSS selector.
 		 * 
+		 * Normalizes the changes between Flex 3.x and Flex 4.x - specify the full path to the component class for both.
+		 * 
 		 * @see mx.styles.IStyleManager#getStyleDeclaration()
 		 * @see mx.styles.IStyleManager2#getStyleDeclaration()
 		 */
@@ -49,10 +51,15 @@ package com.codecatalyst.util
 			var result : CSSStyleDeclaration = null;
 
 			CONFIG::FLEX3 {
-				result = StyleManager.getStyleDeclaration( style ); 
+				var expression:RegExp = /^(.*)\.([^.]+)$/;
+				var match:Object = expression.exec( style );
+
+				var className:String = ( match ) ? match[ 1 ] as String : style;
+
+				result = StyleManager.getStyleDeclaration( className ); 
 			}
 			CONFIG::FLEX4 {
-				result = StyleManager.getStyleManager(module).getStyleDeclaration( style );
+				result = StyleManager.getStyleManager( module ).getStyleDeclaration( style );
 			}
 
 			return result; 
@@ -70,7 +77,7 @@ package com.codecatalyst.util
 				StyleManager.setStyleDeclaration( style, declaration, update ); 
 			}
 			CONFIG::FLEX4 {
-				StyleManager.getStyleManager(module).setStyleDeclaration( style, declaration, update ); 
+				StyleManager.getStyleManager( module ).setStyleDeclaration( style, declaration, update ); 
 			}
 		}