fixed: merge conflicts

riot · Jun 27, 2015 · bb137a6 · bb137a6
1 parent 7ec905c
commit bb137a6
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/lib/browser/tag/each.js b/lib/browser/tag/each.js
@@ -43,7 +43,9 @@ function _each(dom, parent, expr) {
 
       // object loop. any changes cause full redraw
       if (!isArray(items)) {
-        var testsum = JSON.stringify(items)
+        test = checksum
+        checksum = items ? JSON.stringify(items) : ''
+        if (checksum === test) return
 
         items = !items ? [] :
           Object.keys(items).map(function (key) {
@@ -94,13 +96,4 @@ function _each(dom, parent, expr) {
       })
     })
 
-    rendered = items.slice()
-
-  }).one('updated', function() {
-    var keys = Object.keys(parent)// only set new values
-    walk(root, function(dom) {
-      setNamed(dom, parent, keys)
-    })
-  })
-
 }