Merge pull request #19 from latentflip/master

Support single quotes for attributes as well as double quotes. fixes #18

Author: sokra

lib/attributesParser.js

@@ -4,6 +4,15 @@
 */
 var Parser = require("fastparse");
 
+var processMatch = function(match, strUntilValue, name, value, index) {
+    if(!this.isRelevantTagAttr(this.currentTag, name)) return;
+    this.results.push({
+        start: index + strUntilValue.length,
+        length: value.length,
+        value: value
+    });
+};
+
 var parser = new Parser({
 	outside: {
 		"<!--.*?-->": true,
@@ -18,22 +27,9 @@ var parser = new Parser({
 	inside: {
 		"\\s+": true, // eat up whitespace
 		">": "outside", // end of attributes
-		"(([a-zA-Z\\-]+)\\s*=\\s*\")([^\"]*)\"": function(match, strUntilValue, name, value, index) {
-			if(!this.isRelevantTagAttr(this.currentTag, name)) return;
-			this.results.push({
-				start: index + strUntilValue.length,
-				length: value.length,
-				value: value
-			});
-		},
-		"(([a-zA-Z\\-]+)\\s*=\\s*)([^\\s>]+)": function(match, strUntilValue, name, value, index) {
-			if(!this.isRelevantTagAttr(this.currentTag, name)) return;
-			this.results.push({
-				start: index + strUntilValue.length,
-				length: value.length,
-				value: value
-			});
-		}
+		"(([a-zA-Z\\-]+)\\s*=\\s*\")([^\"]*)\"": processMatch,
+		"(([a-zA-Z\\-]+)\\s*=\\s*\')([^\']*)\'": processMatch,
+		"(([a-zA-Z\\-]+)\\s*=\\s*)([^\\s>]+)": processMatch
 	}
 });
 

test/parserTest.js

@@ -14,6 +14,7 @@ function test(name, html, result) {
 
 describe("parser", function() {
 	test("normal", 'Text <img src="image.png"><img src="image2.png">', ["image.png", "image2.png"]);
+	test("single-quotes", "Text <img src='image.png'><img src='image2.png'>", ["image.png", "image2.png"]);
 	test("whitespace", 'T ex t  <img \t  src =   "image.png"   >  <img\t\nsrc\n=\n"image2.png"\n>', ["image.png", "image2.png"]);
 	test("whitespace2", 'Text < img src="image.png" >', []);
 	test("wrong <", 'Text <<img src="image.png">', ["image.png"]);