update CSSExpression.js

Author: myhere

lib/CSSValueExpression.js

@@ -43,7 +43,7 @@ CSSOM.CSSValueExpression.prototype.parse = function() {
 				STRING: 1,
 				REGEXP: 2
 			},
-			state = STATES.LITERAL;
+			state = STATES.LITERAL,
 			string_sep = '',
 			expression = '',
 			error = '',
@@ -158,10 +158,10 @@ CSSOM.CSSValueExpression.prototype.parse = function() {
  * parse regexp in css expression
  *
  * @return {Object|false}
- *         - idx:
- *         - regExp:
- *         or 
- *         false
+ *				 - idx:
+ *				 - regExp:
+ *				 or 
+ *				 false
  */
 
 /*
@@ -204,83 +204,83 @@ all legal RegExp
 =/a/
 ,/a/
 
-    delete /a/
-        in /a/
+		delete /a/
+				in /a/
 instanceof /a/
-       new /a/
-    typeof /a/
-      void /a/
+			 new /a/
+		typeof /a/
+			void /a/
 
 */
 function parseJSRexExp(token, idx) {
-  var before = token.substring(0, idx).trimRight(),
-      legalRegx = [
-        /^$/,
-        /\($/,
-        /\[$/,
-        /\!$/,
-        /\+$/,
-        /\-$/,
-        /\*$/,
-        /\/\s+/,
-        /\%$/,
-        /\=$/,
-        /\>$/,
-        /\<$/,
-        /\&$/,
-        /\|$/,
-        /\^$/,
-        /\~$/,
-        /\?$/,
-        /\,$/,
-        /delete$/,
-        /in$/,
-        /instanceof$/,
-        /new$/,
-        /typeof$/,
-        /void$/,
-      ];
-
-  var isLegal = legalRegx.some(function(reg) {
-    return reg.test(before);
-  });
-
-  if (!isLegal) {
-    return false;
-  } else {
-    var startIdx = idx,
-        regexp;
-
-    while(true) {
-      var regEndIdx = token.indexOf('/', startIdx + 1);
-
-      if (regEndIdx === -1) {
-        return false;
-      } else {
-        regexp = token.substring(idx + 1, regEndIdx);
-        var matched = regexp.match(/\\+$/);
-        if (!matched || matched[0] % 2 == 0) {
-          regexp = '/' + regexp + '/';
-          break;
-        } else {
-          startIdx = regEndIdx;
-        }
-      }
-    }
-  }
-
-  // validate
-  // RegExp boundary(/) must be in the same line
-  var nextNewLineIdx = token.indexOf('\n', idx + 1);
-  if (nextNewLineIdx < regEndIdx) {
-    return false;
-  }
-
-
-  return {
-    idx: regEndIdx,
-    regExp: regexp
-  };
+	var before = token.substring(0, idx).trimRight(),
+			legalRegx = [
+				/^$/,
+				/\($/,
+				/\[$/,
+				/\!$/,
+				/\+$/,
+				/\-$/,
+				/\*$/,
+				/\/\s+/,
+				/\%$/,
+				/\=$/,
+				/\>$/,
+				/\<$/,
+				/\&$/,
+				/\|$/,
+				/\^$/,
+				/\~$/,
+				/\?$/,
+				/\,$/,
+				/delete$/,
+				/in$/,
+				/instanceof$/,
+				/new$/,
+				/typeof$/,
+				/void$/,
+			];
+
+	var isLegal = legalRegx.some(function(reg) {
+		return reg.test(before);
+	});
+
+	if (!isLegal) {
+		return false;
+	} else {
+		var startIdx = idx,
+				regexp;
+
+		while(true) {
+			var regEndIdx = token.indexOf('/', startIdx + 1);
+
+			if (regEndIdx === -1) {
+				return false;
+			} else {
+				regexp = token.substring(idx + 1, regEndIdx);
+				var matched = regexp.match(/\\+$/);
+				if (!matched || matched[0] % 2 == 0) {
+					regexp = '/' + regexp + '/';
+					break;
+				} else {
+					startIdx = regEndIdx;
+				}
+			}
+		}
+	}
+
+	// validate
+	// RegExp boundary(/) must be in the same line
+	var nextNewLineIdx = token.indexOf('\n', idx + 1);
+	if (nextNewLineIdx < regEndIdx) {
+		return false;
+	}
+
+
+	return {
+		idx: regEndIdx,
+		regExp: regexp
+	};
 }
 
 

lib/parse.js

@@ -222,7 +222,7 @@ CSSOM.parse = function parse(token) {
       if (state === 'value') {
         // ie css expression mode
         if (buffer.trim() == 'expression') {
-          var info = new CSSOM.CSSValueExpression(token, i).parse();
+          var info = (new CSSOM.CSSValueExpression(token, i)).parse();
 
           if (info.error) {
             parseError(info.error);

spec/CSSValueExpression.spec.js

@@ -0,0 +1,51 @@
+describe('CSSOM', function() {
+describe('CSSValueExpression', function() {
+
+	var END = '__EOL__';
+
+
+	var cssExpressionValue = [
+"(function(hash){",
+"	if (!hash.match(/#[0-9a-f]{3,6}/g)) {",
+"		hash = hash.substr(1);",
+"		if (!hash) {",
+"			hash = '#ccc';",
+"		}",
+"	}",
+
+"	var n1 = 4/5;",
+
+"	// hello line comment",
+
+"	var n2 = 5/6;",
+
+"	var r1 = /hello ( /img;",
+
+"	// hello line comment",
+
+"	/* hello block comment */",
+
+"	return hash;",
+"}(location.hash))",
+
+END
+
+	].join('\n');
+
+
+
+	given(cssExpressionValue, function(token) {
+		var i = 0;
+
+		var info = (new CSSOM.CSSValueExpression(token, i)).parse();
+
+		expect(info.idx).toBeDefined();
+
+		var end = token.substr(info.idx + 1);
+		end = end.trim();
+		expect(end).toBe(END);
+	});
+
+
+});
+});

spec/index.html

@@ -21,6 +21,7 @@
 	<script src="CSSStyleRule.spec.js"></script>
 	<script src="CSSStyleDeclaration.spec.js"></script>
 	<script src="CSSStyleSheet.spec.js"></script>
+	<script src="CSSValueExpression.spec.js"></script>
 	<script>
 	var htmlReporter = new jasmine.HtmlReporter();
 	var jasmineEnv = jasmine.getEnv();