Fix a cyclic updates microdata -> nodeValue -> textNode -> nodeValue

lovelyscalabledrawings · Apr 11, 2012 · 8d9fb2f · 8d9fb2f
1 parent 3c944a3
commit 8d9fb2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Source/DOM/Element.js b/Source/DOM/Element.js
@@ -600,7 +600,7 @@ LSD.Element.prototype.__properties = {
         }
       }
     }
-    this.set('nodeValue', value, 'textContent', true, old);
+    if (memo !== 'nodeValue') this.set('nodeValue', value, 'textContent', true, old);
   },
   /*
     Different types of elements have different strategies to define value.

diff --git a/Source/Object/Journal.js b/Source/Object/Journal.js
@@ -81,14 +81,14 @@ LSD.Journal.prototype.set = function(key, value, memo, prepend, old) {
       var j = group.length;
       if (prepend) {
         for (var i = 0; i < j; i++) if (group[i] === old) {
-            group.splice(i, 1);
+          group.splice(i, 1);
-            break;
+          break;
-          }
+        }
       } else {
         for (; --j > -1;) if (group[j] === old) {
-            group.splice(j, 1);
+          group.splice(j, 1);
-            break;
+          break;
-          }
+        }
       }
     }
     if (vdef)

diff --git a/Source/Properties/Attributes.js b/Source/Properties/Attributes.js
@@ -64,6 +64,7 @@ LSD.Properties.Microdata.prototype.onChange = function(key, value, memo, old) {
     if (odef && old !== storage[key]) odef = old = undefined;
     if (typeof storage[key] == 'undefined' ? !vdef || value === element.nodeValue : !odef) return;
     if (vdef) storage[key] = value;
+    else delete storage[key];
     element.mix('nodeValue', value, 'microdata', old);
   }
 }
@@ -80,8 +81,7 @@ LSD.Properties.Microdata.prototype._script = function(key, value, memo) {
   value.watch('nodeValue', [this, key]);
 }
 LSD.Properties.Microdata.prototype._unscript = function(key, value, memo) {
-  if (this._elements[key] === value) delete this._elements[key];
+  var group = this._elements[key];
-  else this._elements[key].splice(this._elements[key].indexOf(value), 1);
   value.unwatch('nodeValue', [this, key]);
 }
 LSD.Properties.Variables = LSD.Struct('Journal');