Allow \' and \" in strings. #39

NV · Jul 18, 2012 · 30c066c · 30c066c
1 parent 6911c38
commit 30c066c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/lib/parse.js b/lib/parse.js
@@ -73,10 +73,13 @@ CSSOM.parse = function parse(token) {
 
 		// String
 		case '"':
-			index = token.indexOf('"', i + 1) + 1;
-			if (!index) {
-				parseError('Unmatched "');
-			}
+			index = i + 1;
+			do {
+				index = token.indexOf('"', index) + 1;
+				if (!index) {
+					parseError('Unmatched "');
+				}
+			} while (token[index - 2] === '\\')
 			buffer += token.slice(i, index);
 			i = index - 1;
 			switch (state) {
@@ -90,10 +93,13 @@ CSSOM.parse = function parse(token) {
 			break;
 
 		case "'":
-			index = token.indexOf("'", i + 1) + 1;
-			if (!index) {
-				parseError("Unmatched '");
-			}
+			index = i + 1;
+			do {
+				index = token.indexOf("'", index) + 1;
+				if (!index) {
+					parseError("Unmatched '");
+				}
+			} while (token[index - 2] === '\\')
 			buffer += token.slice(i, index);
 			i = index - 1;
 			switch (state) {

diff --git a/spec/parse.spec.js b/spec/parse.spec.js
@@ -956,9 +956,30 @@ describe('parse', function() {
 		});
 	});
 
+	given('a{content:"\\""}', function(input) {
+		var parsed = CSSOM.parse(input);
+		expect(parsed.cssRules[0].style.content).toBe('"\\""');
+	});
+
+	given("a{content:'\\''}", function(input) {
+		var parsed = CSSOM.parse(input);
+		expect(parsed.cssRules[0].style.content).toBe("'\\''");
+	});
+
+	given('a{content:"abc\\"\\"d\\"ef"}', function(input) {
+		var parsed = CSSOM.parse(input);
+		expect(parsed.cssRules[0].style.content).toBe('"abc\\"\\"d\\"ef"');
+	});
+
+	given("a{content:'abc\\'\\'d\\'ef'}", function(input) {
+		var parsed = CSSOM.parse(input);
+		expect(parsed.cssRules[0].style.content).toBe("'abc\\'\\'d\\'ef'");
+	});
+
 });
 });
 
+
 /**
  * Recursively remove all keys which start with '_', except "_vendorPrefix", which needs to be tested against.
  * @param {Object} object