diff --git a/src/com/flashartofwar/fcss/behaviors/ApplyStyleBehavior.as b/src/com/flashartofwar/fcss/behaviors/ApplyStyleBehavior.as index 9d7d1c5..fce4a95 100644 --- a/src/com/flashartofwar/fcss/behaviors/ApplyStyleBehavior.as +++ b/src/com/flashartofwar/fcss/behaviors/ApplyStyleBehavior.as @@ -140,7 +140,7 @@ package com.flashartofwar.fcss.behaviors } else { - style = _styleSheet.getStyle.apply(null, defaultStyleNames); + style = _styleSheet.getStyle(defaultStyleNames); } if (style.styleName != CSSProperties.DEFAULT_STYLE_NAME) @@ -252,7 +252,7 @@ package com.flashartofwar.fcss.behaviors } else { - tempStyle = _styleSheet.getStyle.apply(null, stateSelectorCache[state]); + tempStyle = _styleSheet.getStyle(stateSelectorCache[state]); cachedProperties[selectorNamesID] = tempStyle; } diff --git a/src/com/flashartofwar/fcss/factories/TextFieldFactory.as b/src/com/flashartofwar/fcss/factories/TextFieldFactory.as index cd808df..8a65dac 100644 --- a/src/com/flashartofwar/fcss/factories/TextFieldFactory.as +++ b/src/com/flashartofwar/fcss/factories/TextFieldFactory.as @@ -80,7 +80,7 @@ package com.flashartofwar.fcss.factories { var textField:TextField = new TextField(); - var style:IStyle = _styleSheet.getStyle("." + className, "#" + id); + var style:IStyle = _styleSheet.getStyle(["." + className, "#" + id]); _applicator.applyStyle(textField, style); diff --git a/src/com/flashartofwar/fcss/stylesheets/FStyleSheet.as b/src/com/flashartofwar/fcss/stylesheets/FStyleSheet.as index 7a69f4c..7569228 100644 --- a/src/com/flashartofwar/fcss/stylesheets/FStyleSheet.as +++ b/src/com/flashartofwar/fcss/stylesheets/FStyleSheet.as @@ -127,23 +127,20 @@ package com.flashartofwar.fcss.stylesheets indexCSS(this.cssText); // Force @variables to cache - var style:IStyle = getStyle("@variables"); + var style:IStyle = getStyle(["@variables"]); return this; } /** - *

This looks up a style and returns an object. To help support style - * inheritance you can also pass in an comma delimited string and have - * the list merged into one style based on the order of the list. The - * first item being lower all the way up to the last in the list.

- * + *

This looks up a style and returns an object.

* @param styleName * @return * */ - public function getStyle(... styleNames):IStyle + public function getStyle(styleNames: Array):IStyle { + // // Split styles and get the total related classes var total:Number = styleNames.length; var baseProperties:IStyle = createEmptyStyle(); @@ -215,7 +212,7 @@ package com.flashartofwar.fcss.stylesheets { if ((hasStyle(styleNames[i]) && (styleNames[i] is String))) { - tempCSSText += getStyle(styleNames[i]).toString(); + tempCSSText += getStyle([ styleNames[i] ]).toString(); } } // Strip classes from a styles @@ -430,7 +427,7 @@ package com.flashartofwar.fcss.stylesheets if (cachedstyles["@variables"]) { // If we have a cached variable style run it through the replacer - cssText = replaceVaribales(cssText, cachedstyles["@variables"]); + cssText = replaceVariables(cssText, cachedstyles["@variables"]); } // End - Test for Variables var tempObject:IStyle = createEmptyStyle(); @@ -509,7 +506,7 @@ package com.flashartofwar.fcss.stylesheets * @return * */ - protected function replaceVaribales(text:String, paramObj:Object):String + protected function replaceVariables(text:String, paramObj:Object):String { return text.replace(CSS_VAR_PATTERN, function():* { diff --git a/src/com/flashartofwar/fcss/stylesheets/IStyleSheet.as b/src/com/flashartofwar/fcss/stylesheets/IStyleSheet.as index 9f5de56..1f3c3ff 100644 --- a/src/com/flashartofwar/fcss/stylesheets/IStyleSheet.as +++ b/src/com/flashartofwar/fcss/stylesheets/IStyleSheet.as @@ -47,7 +47,7 @@ package com.flashartofwar.fcss.stylesheets function newStyle(name:String, style:IStyle):void; - function getStyle(... styleName):IStyle; + function getStyle(styleNames: Array):IStyle; function hasStyle(name:String):Boolean; diff --git a/src/com/flashartofwar/fcss/stylesheets/StyleSheetCollection.as b/src/com/flashartofwar/fcss/stylesheets/StyleSheetCollection.as index b2a4e66..204f7c5 100644 --- a/src/com/flashartofwar/fcss/stylesheets/StyleSheetCollection.as +++ b/src/com/flashartofwar/fcss/stylesheets/StyleSheetCollection.as @@ -112,7 +112,7 @@ package com.flashartofwar.fcss.stylesheets * @return * */ - public function getStyle(... styleNames):IStyle + public function getStyle(styleNames: Array):IStyle { var baseStyle:IStyle = createEmptyStyle(); var styleName:String; diff --git a/test/com/flashartofwar/fcss/behaviors/ApplyStyleBehaviorTest.as b/test/com/flashartofwar/fcss/behaviors/ApplyStyleBehaviorTest.as index f3adf8e..7c97f21 100644 --- a/test/com/flashartofwar/fcss/behaviors/ApplyStyleBehaviorTest.as +++ b/test/com/flashartofwar/fcss/behaviors/ApplyStyleBehaviorTest.as @@ -44,7 +44,7 @@ package com.flashartofwar.fcss.behaviors [Test] public function testApplyStyle():void { - dummyClassA.applyStyle(collection.getStyle("#testStyle")); + dummyClassA.applyStyle(collection.getStyle(["#testStyle"])); Assert.assertEquals(dummyClassA.x, 350); } @@ -99,7 +99,7 @@ package com.flashartofwar.fcss.behaviors [Test] public function testForEmptyStyle():void { - var style:IStyle = collection.getStyle("DummyClass", "#dummyClassB", "bla"); + var style:IStyle = collection.getStyle(["DummyClass", "#dummyClassB", "bla"]); Assert.assertEquals(style.styleName, "#dummyClassB"); } @@ -162,12 +162,12 @@ class DummyClass extends Sprite implements IApplyStyleBehavior return styleBehavior.getPseudoSelector(state); } - public function get z():Number + public override function get z():Number { return _z; } - public function set z(value:Number):void + public override function set z(value:Number):void { _z = value; } diff --git a/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionMultipleStyleSheetMergeTest.as b/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionMultipleStyleSheetMergeTest.as index 02c6805..0b3fba4 100644 --- a/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionMultipleStyleSheetMergeTest.as +++ b/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionMultipleStyleSheetMergeTest.as @@ -168,7 +168,7 @@ package com.flashartofwar.fcss.stylesheets { addStyleSheet(styleSheetB, "sheetB"); removeStyleSheet("sheetB"); - var style:IStyle = getStyle("baseStyle"); + var style:IStyle = getStyle(["baseStyle"]); var expected:String = "baseStyle{styleName:baseStyle;x:10;y:10;width:100;height:100;padding:5;margin:10;}" Assert.assertEquals(style.toString(), expected); } @@ -178,7 +178,7 @@ package com.flashartofwar.fcss.stylesheets { addStyleSheet(styleSheetB, "sheetB"); removeStyleSheet("sheetA"); - var style:IStyle = getStyle("baseStyle"); + var style:IStyle = getStyle(["baseStyle"]); var expected:String = "baseStyle{styleName:baseStyle;x:300px;height:150px;margin:0;}" Assert.assertEquals(style.toString(), expected); } @@ -187,7 +187,7 @@ package com.flashartofwar.fcss.stylesheets public function testLocalStyleInheritanceSheetB():void { addStyleSheet(styleSheetB, "sheetB"); - var style:IStyle = getStyle("#thickBorder"); + var style:IStyle = getStyle(["#thickBorder"]); var expected:String = "#thickBorder{styleName:#thickBorder;x:0;y:10;width:100;height:150px;padding:5;margin:0;border:10px solid green;}"; Assert.assertEquals(style.toString(), expected); } diff --git a/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionTest.as b/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionTest.as index 117519a..91080f6 100644 --- a/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionTest.as +++ b/test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionTest.as @@ -70,7 +70,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle"]) as Style; var output:String = "baseStyle{styleName:baseStyle;x:300px;y:10;width:100;height:150px;padding:5;margin:0;}"; Assert.assertEquals(style.toString(), output); } @@ -95,7 +95,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle"]) as Style; Assert.assertEquals(style.styleName, "baseStyle"); } @@ -105,7 +105,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle"]) as Style; Assert.assertEquals(style.y, "10"); } @@ -115,7 +115,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle"]) as Style; Assert.assertEquals(style.width, "100"); } @@ -125,7 +125,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle"]) as Style; Assert.assertEquals(style.padding, "5"); } @@ -135,7 +135,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle"]) as Style; Assert.assertEquals(style.x, "300px"); } @@ -166,7 +166,7 @@ package com.flashartofwar.fcss.stylesheets style.styleName = "Teststyle"; styleSheetCollection.newStyle("Teststyle", style); - Assert.assertEquals(styleSheetCollection.getStyle("Teststyle").styleName, "Teststyle"); + Assert.assertEquals(styleSheetCollection.getStyle(["Teststyle"]).styleName, "Teststyle"); } [Test] @@ -256,7 +256,7 @@ package com.flashartofwar.fcss.stylesheets public function testForEmptyStyle():void { addBothStyleSheets(); - var style:IStyle = styleSheetCollection.getStyle("baseStyle", "#playButton"); + var style:IStyle = styleSheetCollection.getStyle(["baseStyle", "#playButton"]); Assert.assertEquals(style.styleName, "#playButton"); } @@ -266,7 +266,7 @@ package com.flashartofwar.fcss.stylesheets { addBothStyleSheets(); - var style:Style = styleSheetCollection.getStyle("baseStyle", "foobar") as Style; + var style:Style = styleSheetCollection.getStyle(["baseStyle", "foobar"]) as Style; Assert.assertEquals(style.padding, "5"); } diff --git a/test/com/flashartofwar/fcss/stylesheets/StyleSheetEmptySelectorTest.as b/test/com/flashartofwar/fcss/stylesheets/StyleSheetEmptySelectorTest.as index 2e8c17d..00cd6ba 100644 --- a/test/com/flashartofwar/fcss/stylesheets/StyleSheetEmptySelectorTest.as +++ b/test/com/flashartofwar/fcss/stylesheets/StyleSheetEmptySelectorTest.as @@ -19,7 +19,7 @@ package com.flashartofwar.fcss.stylesheets public function testForEmptyStyle():void { collection.parseCSS(cssText); - var style:IStyle = collection.getStyle("DummyClass", "#dummyClassB", "bla"); + var style:IStyle = collection.getStyle(["DummyClass", "#dummyClassB", "bla"]); Assert.assertEquals(style.styleName, "#dummyClassB"); } diff --git a/test/com/flashartofwar/fcss/stylesheets/StyleSheetTest.as b/test/com/flashartofwar/fcss/stylesheets/StyleSheetTest.as index 800f74d..2863599 100644 --- a/test/com/flashartofwar/fcss/stylesheets/StyleSheetTest.as +++ b/test/com/flashartofwar/fcss/stylesheets/StyleSheetTest.as @@ -50,7 +50,7 @@ package com.flashartofwar.fcss.stylesheets public function testGetstyle():void { - var style:IStyle = sheet.getStyle("#playButton"); + var style:IStyle = sheet.getStyle(["#playButton"]); var sampleTest:String = "#playButton{styleName:#playButton;background-color:#FFFFFF;background-image:url('/images/play_button_background.jpg');}"; Assert.assertEquals(style.toString(), sampleTest); } @@ -65,7 +65,7 @@ package com.flashartofwar.fcss.stylesheets sheet.newStyle("teststyle", prop); - Assert.assertEquals(sheet.getStyle("teststyle").toString(), prop.toString()); + Assert.assertEquals(sheet.getStyle(["teststyle"]).toString(), prop.toString()); } [Test] @@ -92,7 +92,7 @@ package com.flashartofwar.fcss.stylesheets public function testSecondCSSParseStyle():void { praseSecondCSSSheet(); - var style:IStyle = sheet.getStyle("baseStyle"); + var style:IStyle = sheet.getStyle(["baseStyle"]); var sampleTest:String = "baseStyle{styleName:baseStyle;x:300;y:10;width:100px;height:150px;padding:5;margin:0;}"; Assert.assertEquals(style.toString(), sampleTest); } @@ -134,14 +134,14 @@ package com.flashartofwar.fcss.stylesheets public function testVaribleMerge():void { sheet.parseCSS(StyleSheetTextCSSData.cssTextB); - Assert.assertEquals(sheet.getStyle("@variables").toString(), "@variables{styleName:@variables;defaultColor:#333333;test2:FooBar;}"); + Assert.assertEquals(sheet.getStyle(["@variables"]).toString(), "@variables{styleName:@variables;defaultColor:#333333;test2:FooBar;}"); } [Test] public function testVariableReplace():void { - var style:IStyle = sheet.getStyle("#playButton:over"); + var style:IStyle = sheet.getStyle(["#playButton:over"]); Assert.assertEquals(style.toString(), "#playButton:over{styleName:#playButton:over;background-color:#333333;background-image:url('/images/play_button_background.jpg');}"); } @@ -156,7 +156,7 @@ package com.flashartofwar.fcss.stylesheets for (i = 0; i < total; i ++) { - style = sheet.getStyle(sheet.styleNames[i]); + style = sheet.getStyle([sheet.styleNames[i]]); } Assert.assertEquals(sheet.styleNames.length, total); } @@ -165,7 +165,7 @@ package com.flashartofwar.fcss.stylesheets public function testRetainCSSUnitInformation():void { - var style:Style = sheet.getStyle("baseStyle") as Style; + var style:Style = sheet.getStyle(["baseStyle"]) as Style; Assert.assertEquals(style.width, "100px"); } @@ -228,21 +228,21 @@ package com.flashartofwar.fcss.stylesheets [Test] public function testSingleMergeEmptyStyleDoesNotGetMerged():void { - var style:IStyle = sheet.getStyle("baseStyle", ".FooBar"); + var style:IStyle = sheet.getStyle(["baseStyle", ".FooBar"]); Assert.assertEquals(style.styleName, "baseStyle"); } [Test] public function testMergeEmptyStyleDoesNotGetMerged():void { - var style:IStyle = sheet.getStyle("baseStyle", "#playButton", ".FooBar"); + var style:IStyle = sheet.getStyle(["baseStyle", "#playButton", ".FooBar"]); Assert.assertEquals(style.styleName, "#playButton"); } [Test] public function testMergeEmptyPseudoSelectorDoesNotGetMerged():void { - var style:IStyle = sheet.getStyle("baseStyle", ".FooBar:up"); + var style:IStyle = sheet.getStyle(["baseStyle", ".FooBar:up"]); Assert.assertEquals(style.styleName, "baseStyle"); } }