Merge pull request #5 from neraliu/code-enhancement

minor enhancement of the code and increase code coverage to 100%
YahooArchive · Jun 26, 2015 · cbcf088 · cbcf088
2 parents 0f7304b + 61aa76f
commit cbcf088
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/src/html-purify.js b/src/html-purify.js
@@ -25,6 +25,7 @@ See the accompanying LICENSE file for terms.
         this.cssParser = new CssParser({"ver": "strict", "throwError": false});
     }
 
+    // TODO: introduce polyfill for Array.indexOf
     function contains(arr, element) {
         for (var i = 0, len = arr.length; i < len; i++) {
             if (arr[i] === element) {
@@ -49,14 +50,11 @@ See the accompanying LICENSE file for terms.
         case 1:
 	    this.output += ch;
 	    break;
+
         case 2:
-            if (prevState === 35) {
-                this.attrVals[attributeName] = attributeValue;
-            }
-            if (prevState === 36) {
-                this.attrVals[attributeName] = attributeValue;
-            }
-            if (prevState === 40) {
+            if (prevState === 35 ||
+                prevState === 36 || 
+                prevState === 40) {
                 this.attrVals[attributeName] = attributeValue;
             }
 

diff --git a/src/tag-attr-list.js b/src/tag-attr-list.js
@@ -121,7 +121,6 @@ Whitelist.Tags = [
     "wbr"
 ];
 
-
 Whitelist.Attributes = [
     "ept",
     "acceptCharset",
@@ -222,22 +221,22 @@ Whitelist.Attributes = [
 ];
 
 Whitelist.HrefAttributes = [
-"action",
-"background",
-"codebase",
-"cite",
-"classid",
-"formaction",
-"folder",
-"href",
-"icon",
-"longdesc",
-"manifest",
-"profile",
-"poster",
-"src",
-"usemap",
-"xlink:href"
+    "action",
+    "background",
+    "codebase",
+    "cite",
+    "classid",
+    "formaction",
+    "folder",
+    "href",
+    "icon",
+    "longdesc",
+    "manifest",
+    "profile",
+    "poster",
+    "src",
+    "usemap",
+    "xlink:href"
 ];
 
 module.exports = Whitelist;