Merge branch 'des-des-master'

Author: rayd

lib/parse-tag.js

@@ -1,9 +1,10 @@
-var attrRE = /([\w-]+)|(['"])([.\s\S]*?)\2/g;
+var attrRE = /([\w-]+)|=|(['"])([.\s\S]*?)\2/g;
 var voidElements = require('void-elements');
 
 module.exports = function (tag) {
     var i = 0;
     var key;
+    var expectingValueAfterEquals = true;
     var res = {
         type: 'tag',
         name: '',
@@ -13,8 +14,17 @@ module.exports = function (tag) {
     };
 
     tag.replace(attrRE, function (match) {
-        if (i % 2) {
-            key = match;
+        if (match === '=') {
+            expectingValueAfterEquals = true;
+            i++;
+            return;
+        }
+
+        if (!expectingValueAfterEquals) {
+            if (key) {
+                res.attrs[key] = key; // boolean attribute
+            }
+            key=match;
         } else {
             if (i === 0) {
                 if (voidElements[match] || tag.charAt(tag.length - 2) === '/') {
@@ -23,9 +33,11 @@ module.exports = function (tag) {
                 res.name = match;
             } else {
                 res.attrs[key] = match.replace(/^['"]|['"]$/g, '');
+                key=undefined;
             }
         }
         i++;
+        expectingValueAfterEquals = false;
     });
 
     return res;

test/parse-tag.js

@@ -66,7 +66,7 @@ test('parseTag', function (t) {
         voidElement: false,
         children: []
     });
-    
+
     tag = '<textarea placeholder=\'Hey Usher, \n\nAre these modals for real?!\' class=\'placeholder-value\'>';
 
     t.deepEqual(parseTag(tag), {
@@ -80,5 +80,19 @@ test('parseTag', function (t) {
         children: []
     });
 
+    tag = '<input checked name="sad" type="checkbox">';
+
+    t.deepEqual(parseTag(tag), {
+        type: 'tag',
+        attrs: {
+            type: 'checkbox',
+            checked: 'checked',
+            name: 'sad'
+        },
+        name: 'input',
+        voidElement: true,
+        children: []
+    });
+
     t.end();
 });