Skip to content

Performance fixes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oaubert wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Performance fixes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4721e79
Fix override function definition
oaubert Jan 25, 2012
9f98dca
Make getStyle parameter an Array instead of a varargs.
oaubert Mar 29, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/com/flashartofwar/fcss/behaviors/ApplyStyleBehavior.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/com/flashartofwar/fcss/factories/TextFieldFactory.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
17 changes: 7 additions & 10 deletions src/com/flashartofwar/fcss/stylesheets/FStyleSheet.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
* <p>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.</p>
*
* <p>This looks up a style and returns an object.</p>
* @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();
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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():*
{
Expand Down
2 changes: 1 addition & 1 deletion src/com/flashartofwar/fcss/stylesheets/IStyleSheet.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/com/flashartofwar/fcss/stylesheets/StyleSheetCollection.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions test/com/flashartofwar/fcss/behaviors/ApplyStyleBehaviorTest.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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");
}

Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionMultipleStyleSheetMergeTest.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
18 changes: 9 additions & 9 deletions test/com/flashartofwar/fcss/stylesheets/StyleSheetCollectionTest.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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");
}

Expand All @@ -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");
}

Expand All @@ -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");
}

Expand All @@ -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");
}

Expand All @@ -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");
}

Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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");
}

Expand All @@ -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");
}

Expand Down
2 changes: 1 addition & 1 deletion test/com/flashartofwar/fcss/stylesheets/StyleSheetEmptySelectorTest.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
20 changes: 10 additions & 10 deletions test/com/flashartofwar/fcss/stylesheets/StyleSheetTest.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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]
Expand All @@ -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);
}
Expand Down Expand Up @@ -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');}");
}

Expand All @@ -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);
}
Expand All @@ -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");
}

Expand Down Expand Up @@ -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");
}
}
Expand Down