Changeset 8721

Timestamp:

01/25/08 18:49:40 (8 months ago)

Author:

andrew

Message:

Prevent DOM node expandos _countedByPrototype and _prototypeEventID from being serialized into (inner|outer)HTML in IE. Closes #10909. [dcpedit, Tobie Langel, Andrew Dupont]

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/event.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/selector.js (modified) (10 diffs)
• spinoffs/prototype/trunk/test/unit/event.html (modified) (3 diffs)
• spinoffs/prototype/trunk/test/unit/selector.html (modified) (2 diffs)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Prevent DOM node expandos _countedByPrototype and _prototypeEventID from being serialized into (inner|outer)HTML in IE. Closes #10909. [dcpedit, Tobie Langel, Andrew Dupont]
-
-* Make Ajax.Request#isSameOrigin JavaScript Lint compliant. [Andrew Dupont]

spinoffs/prototype/trunk/src/event.js

@@ -129 +129 @@
-Object.extend(Event, (function() {
-  var cache = Event.cache;
-
+
-  function getEventID(element) {
-eventID) return element._eventID
+prototypeEventID) return element._prototypeEventID[0]
-    arguments.callee.id = arguments.callee.id || 1;
-eventID = ++arguments.callee.id
+prototypeEventID = [++arguments.callee.id]
-  }
-  

spinoffs/prototype/trunk/src/selector.js

@@ -313 +313 @@
-    // marks an array of nodes for counting
-    mark: function(nodes) {
+      var _true = Prototype.emptyFunction;
-      for (var i = 0, node; node = nodes[i]; i++)
- = 
+ByPrototype = _
-      return nodes;
-    },
@@ -320 +321 @@
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-
+ByPrototype
-      return nodes;  
-    },
@@ -328 +329 @@
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
- = true
+ByPrototype = Prototype.emptyFunction
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-
+ByPrototype
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-
+ByPrototype
-      }
-    },
@@ -345 +346 @@
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-
- = true
+ByPrototype
+ByPrototype = Prototype.emptyFunction
-          results.push(Element.extend(n));
-        }
@@ -548 +549 @@
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-
+ByPrototype
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
@@ -586 +587 @@
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-
+ByPrototype
-      h.unmark(exclusions);
-      return results;
@@ -619 +620 @@
-    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
-  },
+  
+  split: function(expression) {
+    var expressions = [];
+    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+      expressions.push(m[1].strip());
+    });
+    return expressions;
+  },
-
-  matchElements: function(elements, expression) {
@@ -624 +633 @@
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-
+ByPrototype
-    h.unmark(matches);
-    return results;
@@ -637 +646 @@
-  
-  findChildElements: function(element, expressions) {
-
-
-
-
-
+
-    var results = [], h = Selector.handlers;    
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
@@ -652 +657 @@
-
-if (Prototype.Browser.IE) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

spinoffs/prototype/trunk/test/unit/event.html

@@ -27 +27 @@
-  <p id="inner">One two three <span id="span">four</span></p>
-</div>
+<div id="container"><div></div></div>
-
-<!-- Tests follow -->
@@ -175 +176 @@
-      
-      span.observe("test:somethingHappened", observer);
-e
+prototypeE
-      
-      assert(Event.cache[eventID]);
@@ -241 +242 @@
-      assertEqual(null, event.findElement('div.does_not_exist'));
-      assertElementMatches(event.findElement('.does_not_exist, span'), 'span#span');
+    }},
+    
+    testEventIDDuplication: function() { with(this) {
+      $('container').down().observe("test:somethingHappened", Prototype.emptyFunction);
+      $('container').innerHTML += $('container').innerHTML;
+      assertUndefined($('container').down(1)._prototypeEventID);
-    }}
-  });

spinoffs/prototype/trunk/test/unit/selector.html

@@ -89 +89 @@
-    <input type="hidden" id="commaTwo" name="foo2" value="oops" />
-  </form>
-
+<div id="counted_container"><div class="is_counted"></div></div>
-</div> <!-- #fixtures -->
-
@@ -443 +443 @@
-      assert(typeof results[1].show == 'function');
-      assert(typeof results[2].show == 'function');
+    }},
+    
+    testCountedIsNotAnAttribute: function() { with(this) {
+      var el = $('list');
+      Selector.handlers.mark([el]);
+      assert(!el.innerHTML.include("_counted"));
+      Selector.handlers.unmark([el]);
+      assert(!el.innerHTML.include("_counted"));      
+    }},
+
+    testCopiedNodesGetIncluded: function(){ with(this) {
+      assertElementsMatch(
+        Selector.matchElements($('counted_container').descendants(), 'div'),
+        'div.is_counted'
+      );
+      $('counted_container').innerHTML += $('counted_container').innerHTML;
+      assertElementsMatch(
+        Selector.matchElements($('counted_container').descendants(), 'div'), 'div.is_counted', 
+        'div.is_counted'
+      );
-    }}
-  });
+  
-// ]]>
-</script>