refactor: inline extractAttrs

kbrsh · Aug 30, 2017 · 19360fe · 19360fe
1 parent 4638a89
commit 19360fe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 35 deletions.
diff --git a/dist/moon.js b/dist/moon.js
@@ -235,21 +235,6 @@
 
     }
 
-    /**
-     * Converts attributes into key-value pairs
-     * @param {Node} node
-     * @return {Object} Key-Value pairs of Attributes
-     */
-    var extractAttrs = function(node) {
-      var rawAttrs = node.attributes;
-      var attrs = {};
-      for(var i = 0; i < rawAttrs.length; i++) {
-        attrs[rawAttrs[i].name] = rawAttrs[i].value;
-      }
-      return attrs;
-    }
-
-
     /**
      * Adds An Event Handler to a Type of Listener
      * @param {Object} node
@@ -758,7 +743,12 @@
 
         // Diff props
         var props = vnode.props;
-        diffProps(node, extractAttrs(node), vnode, props);
+        var rawNodeAttrs = node.attributes;
+        var nodeAttrs = {};
+        for(var i = 0; i < rawNodeAttrs.length; i++) {
+          nodeAttrs[rawNodeAttrs[i].name] = rawNodeAttrs[i].value;
+        }
+        diffProps(node, nodeAttrs, vnode, props);
 
         // Add event listeners
         var eventListeners = meta.eventListeners;
@@ -772,7 +762,7 @@
           var children = vnode.children;
           var length = children.length;
 
-          var i = 0;
+          var i$1 = 0;
           var currentChildNode = node.firstChild;
           var vchild = length !== 0 ? children[0] : undefined;
           var nextSibling = null;
@@ -791,7 +781,7 @@
               }
             }
 
-            vchild = ++i < length ? children[i] : undefined;
+            vchild = ++i$1 < length ? children[i$1] : undefined;
             currentChildNode = nextSibling;
           }
         }

diff --git a/dist/moon.min.js b/dist/moon.min.js
diff --git a/src/util/dom.js b/src/util/dom.js
@@ -1,18 +1,3 @@
-/**
- * Converts attributes into key-value pairs
- * @param {Node} node
- * @return {Object} Key-Value pairs of Attributes
- */
-const extractAttrs = function(node) {
-  let rawAttrs = node.attributes;
-  let attrs = {};
-  for(let i = 0; i < rawAttrs.length; i++) {
-    attrs[rawAttrs[i].name] = rawAttrs[i].value;
-  }
-  return attrs;
-}
-
-
 /**
  * Adds An Event Handler to a Type of Listener
  * @param {Object} node

diff --git a/src/util/vdom.js b/src/util/vdom.js
@@ -370,7 +370,12 @@ const hydrate = function(node, vnode, parent) {
 
     // Diff props
     let props = vnode.props;
-    diffProps(node, extractAttrs(node), vnode, props);
+    let rawNodeAttrs = node.attributes;
+    let nodeAttrs = {};
+    for(let i = 0; i < rawNodeAttrs.length; i++) {
+      nodeAttrs[rawNodeAttrs[i].name] = rawNodeAttrs[i].value;
+    }
+    diffProps(node, nodeAttrs, vnode, props);
 
     // Add event listeners
     let eventListeners = meta.eventListeners;