Changeset 8537

Timestamp:

01/03/08 01:50:36 (2 years ago)

Author:

tobie

Message:

prototype: Make Element#insert standard-compliant. Fixes an issue in FF3b2 when inserting HTML or text inside DOM nodes which aren't (yet) appended to the document.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (5 diffs)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make Element#insert standard-compliant. Fixes an issue in FF3b2 when inserting HTML or text inside DOM nodes which aren't (yet) appended to the document. [Tobie Langel]
-
-* Add some missing semicolons to the source tree.  Closes #10659.  [Richard Quadling]

spinoffs/prototype/trunk/src/dom.js

@@ -120 +120 @@
-          insertions = {bottom:insertions};
-    
-t, range
+insert, tagName, childNodes
-    
-    for (position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-
+inser
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-t.
+
-        continue;
-      }
@@ -135 +135 @@
-      content = Object.toHTML(content);
-      
-
-
-
+
+
+
+
+
+
+
-      
-      content.evalScripts.bind(content).defer();
@@ -663 +667 @@
-  }
-};
-
-
-if (!document.createRange || Prototype.Browser.Opera) {
-  Element.Methods.insert = function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = { bottom: insertions };
-    
-    var t = Element._insertionTranslations, content, position, pos, tagName;
-    
-    for (position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      pos      = t[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        pos.insert(element, content);
-        continue;
-      }
-     
-      content = Object.toHTML(content);
-      tagName = ((position == 'before' || position == 'after')
-        ? element.parentNode : element).tagName.toUpperCase();
-     
-      if (t.tags[tagName]) {
-        var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-        if (position == 'top' || position == 'after') fragments.reverse();
-        fragments.each(pos.insert.curry(element));
-      }
-      else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
-      
-      content.evalScripts.bind(content).defer();
-    }
-    
-    return element;
-  };
-}
-
-if (Prototype.Browser.Opera) { 
@@ -993 +957 @@
-Element._getContentFromAnonymousElement = function(tagName, html) {
-  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-
-
+
+
+
+
-  return $A(div.childNodes);
-};
-
-Element._insertionTranslations = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  },
-  tags: {
@@ -1043 +987 @@
-
-(function() {
-  this.bottom.initializeRange = this.top.initializeRange;
-  Object.extend(this.tags, {
-    THEAD: this.tags.TBODY,

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

@@ -597 +597 @@
-    }},
-    
+    testNewElementInsert: function() {with(this) {
+      var container = new Element('div');
+      element = new Element('div');
+      container.insert(element);
+      
+      element.insert({ before: '<p>a paragraph</p>' });
+      assertEqual('<p>a paragraph</p><div></div>', getInnerHTML(container));
+      element.insert({ after: 'some text' });
+      assertEqual('<p>a paragraph</p><div></div>some text', getInnerHTML(container));
+      
+      element.insert({ top: '<p>a paragraph</p>' });
+      assertEqual('<p>a paragraph</p>', getInnerHTML(element));
+      element.insert('some text');
+      assertEqual('<p>a paragraph</p>some text', getInnerHTML(element));
+    }},
+    
-    testInsertionBackwardsCompatibility: function() {with(this) {
-      new Insertion.Before('element-insertions-main', 'some backward-compatibility testing before');