Failing unit test, passing token parsing

nschonni · Jan 17, 2013 · b163f0d · b163f0d
1 parent fba219c
commit b163f0d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/css/ValidationTypes.js b/src/css/ValidationTypes.js
@@ -123,7 +123,7 @@ var ValidationTypes = {
         "<length>": function(part){
             if (part.type == "function" && /^(?:\-(?:ms|moz|o|webkit)\-)?calc/i.test(part)){
                 return true;
-            }else{
+            } else {
                 return part.type == "length" || part.type == "number" || part.type == "integer" || part == "0";
             }
         },

diff --git a/tests/css/Parser.js b/tests/css/Parser.js
@@ -1385,6 +1385,13 @@
             var parser = new Parser();
             var result = parser.parsePropertyValue("alpha(opacity=10)");
 
+            Assert.isInstanceOf(parserlib.css.PropertyValue, result);
+        },
+
+        testIECSSExpression1: function(){
+            var parser = new Parser();
+            var result = parser.parsePropertyValue("expression(style.height=parentNode.offsetHeight+'px', style.clear='none', 0)");
+
             Assert.isInstanceOf(parserlib.css.PropertyValue, result);
         }
 

diff --git a/tests/css/TokenStream.js b/tests/css/TokenStream.js
@@ -406,6 +406,11 @@
             "rgb(255,0,1)"      : [CSSTokens.FUNCTION, CSSTokens.NUMBER, CSSTokens.COMMA, CSSTokens.NUMBER, CSSTokens.COMMA, CSSTokens.NUMBER, CSSTokens.RPAREN],
             "counter(par-num,upper-roman)" : [CSSTokens.FUNCTION, CSSTokens.IDENT, CSSTokens.COMMA, CSSTokens.IDENT, CSSTokens.RPAREN],
             "calc(100% - 5px)"      : [CSSTokens.FUNCTION, CSSTokens.PERCENTAGE, CSSTokens.S, CSSTokens.MINUS, CSSTokens.S, CSSTokens.LENGTH, CSSTokens.RPAREN],
+
+			//IE CSS expression
+            "expression(hideFocus='true')"      : [CSSTokens.FUNCTION, CSSTokens.IDENT, CSSTokens.EQUALS, CSSTokens.STRING, CSSTokens.RPAREN],
+            "expression(style.height=(parentNode.offsetHeight - 20)+'px', style.clear='none', 0)"      : [CSSTokens.FUNCTION, CSSTokens.IDENT, CSSTokens.DOT, CSSTokens.IDENT, CSSTokens.EQUALS, CSSTokens.LPAREN, CSSTokens.IDENT, CSSTokens.DOT, CSSTokens.IDENT, CSSTokens.S, CSSTokens.MINUS, CSSTokens.S, CSSTokens.NUMBER, CSSTokens.RPAREN, CSSTokens.PLUS, CSSTokens.STRING, CSSTokens.COMMA, CSSTokens.S, CSSTokens.IDENT, CSSTokens.DOT, CSSTokens.IDENT, CSSTokens.EQUALS, CSSTokens.STRING, CSSTokens.COMMA, CSSTokens.S, CSSTokens.NUMBER, CSSTokens.RPAREN],
+            "expression(style.height=parentNode.offsetHeight+'px', style.clear='none', 0)"      : [CSSTokens.FUNCTION, CSSTokens.IDENT, CSSTokens.DOT, CSSTokens.IDENT, CSSTokens.EQUALS, CSSTokens.IDENT, CSSTokens.DOT, CSSTokens.IDENT, CSSTokens.PLUS, CSSTokens.STRING, CSSTokens.COMMA, CSSTokens.S, CSSTokens.IDENT, CSSTokens.DOT, CSSTokens.IDENT, CSSTokens.EQUALS, CSSTokens.STRING, CSSTokens.COMMA, CSSTokens.S, CSSTokens.NUMBER, CSSTokens.RPAREN],
 
             //old-style IE filters - interpreted as bunch of tokens
             "alpha(opacity=50)" : [CSSTokens.FUNCTION, CSSTokens.IDENT, CSSTokens.EQUALS, CSSTokens.NUMBER, CSSTokens.RPAREN],