Changeset 6725

Timestamp:

05/12/07 05:01:56 (1 year ago)

Author:

sam

Message:

Merge -r6634:HEAD from ../branches/dom.

* Make Element#update and Element#insert work for SELECT tags in IE and Opera. [Tobie Langel]

* Make Element#insert and Element#update better handle TABLE related elements in IE and Opera. Closes #7776, #8040, #7550, #7776, #7938. [Tobie Langel]

* Make Element#readAttribute('title') work in Opera. [Tobie Langel]

* Make Element#replace work with form elements in Firefox and Safari. Closes #8010, #7989. [dsl239, Tobie Langel]

* Add Element#wrap which wraps the element inside a new one. Closes #5732. [P. Vande, Tobie Langel]

* Make Element into a constructor: new Element(tagName, attributes). Add Element#writeAttribute which accepts a hash of attributes or a name/value pair. Closes #7476. [Mislav Marohnić, haraldmartin, Tobie Langel]

* Insertion overhaul: Add Element.insert(content[, position = 'Bottom']). Deprecate Insertion (kept for backwards compatibility). Make Ajax.Updater option.insertion accept both Insertion.Top or the now preferred 'Top'. Closes #7907. [Tobie Langel]

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/ajax.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/deprecated.js (copied) (copied from spinoffs/prototype/branches/dom/src/deprecated.js)
• spinoffs/prototype/trunk/src/dom.js (modified) (11 diffs)
• spinoffs/prototype/trunk/src/enumerable.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/position.js (deleted)
• spinoffs/prototype/trunk/src/prototype.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/string.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/ajax.html (modified) (3 diffs)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (10 diffs)
• spinoffs/prototype/trunk/test/unit/position.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make Element#update and Element#insert work for SELECT tags in IE and Opera. [Tobie Langel]
+
+* Make Element#insert and Element#update better handle TABLE related elements in IE and Opera. Closes #7776, #8040, #7550, #7776, #7938. [Tobie Langel]
+
+* Make Element#readAttribute('title') work in Opera. [Tobie Langel]
+
+* Make Element#replace work with form elements in Firefox and Safari. Closes #8010, #7989. [dsl239, Tobie Langel]
+
+* Add Element#wrap which wraps the element inside a new one. Closes #5732. [P. Vande, Tobie Langel]
+
+* Make Element into a constructor: new Element(tagName, attributes). Add Element#writeAttribute which accepts a hash of attributes or a name/value pair. Closes #7476. [Mislav Marohnić, haraldmartin, Tobie Langel]
+
+* Insertion overhaul: Add Element.insert(content[, position = 'Bottom']). Deprecate Insertion (kept for backwards compatibility). Make Ajax.Updater option.insertion accept both Insertion.Top or the now preferred 'Top'. Closes #7907. [Tobie Langel]
-
-* Refactor Element.extend and eliminate Element.extend.cache.  [sam]

spinoffs/prototype/trunk/src/ajax.js

@@ -255 +255 @@
-  updateContent: function() {
-    var receiver = this.container[this.success() ? 'success' : 'failure'];
-
-
-this.
+, options = this.options
+
+
-    
-    if (receiver = $(receiver)) {
-
-
-
-
+
+
+
+
+
+
-    }
-    

spinoffs/prototype/trunk/src/dom.js

@@ -38 +38 @@
-/*--------------------------------------------------------------------------*/
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Element.Methods = {
@@ -81 +98 @@
-    } else {
-      var range = element.ownerDocument.createRange();
-Contents
+
-      element.parentNode.replaceChild(
-        range.createContextualFragment(html.stripScripts()), element);
@@ -89 +106 @@
-  },
-  
+  insert: function(element, content, position) {
+    element = $(element);
+    position = (position || 'bottom').toLowerCase();
+    var t = Element._insertionTranslations[position], range;
+    
+    if (content && content.ownerDocument === document) {
+      t.insert(element, content);
+      return element;
+    }
+    
+    content = content.toString();
+    
+    range = element.ownerDocument.createRange();
+    t.initializeRange(element, range);
+    t.insert(element, range.createContextualFragment(content.stripScripts()));
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  },
+  
+  wrap: function(element, wrapper) {
+    element = $(element);
+    wrapper = wrapper || 'div';
+    if (typeof wrapper == 'string') wrapper = new Element(wrapper);
+    else Element.extend(wrapper);
+    element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return element;
+  },
+
-  inspect: function(element) {
-    element = $(element);
@@ -194 +241 @@
-    if (Prototype.Browser.IE) {
-      if (!element.attributes) return null;
-
+.read
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name])  name = t.names[name];
@@ -201 +248 @@
-    }    
-    return element.getAttribute(name);
+  },
+  
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = {}, t = Element._attributeTranslations.write;
+    
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = value === undefined ? true : value;
+    
+    for (var attr in attributes) {
+      var name = t.names[attr] || attr, value = attributes[attr];
+      if (t.values[attr]) name = t.values[attr](element, value);
+      if (value === false || value === null)
+        element.removeAttribute(name);
+      else if (value === true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
-  },
-  
@@ -388 +454 @@
-    element._overflow = null;
-    return element;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
-Object.extend(Element.Methods, {
-  childOf: Element.Methods.descendantOf,
-  childElements: Element.Methods.immediateDescendants
-});
+
+Element._attributeTranslations = {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'      
+    }, 
+    values: {}
+  }
+};
+
+
+if (!document.createRange || Prototype.Browser.Opera) {
+  Element.Methods.insert = function(element, content, position) {
+    element = $(element);
+    position = (position || 'bottom').toLowerCase();
+    var t = Element._insertionTranslations, pos = t[position], tagName;
+    
+    if (content && content.ownerDocument === document) {
+      pos.insert(element, content);
+      return element;
+    }
+
+    content = content.toString();
+    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) { 
@@ -407 +660 @@
-      default: return Element._getStyle(element, style); 
-    }
-
+
+
+
+
+
+
-}
+
-else if (Prototype.Browser.IE) {
-  Element.Methods.getStyle = function(element, style) {
@@ -424 +683 @@
-    if (value == 'auto') {
-      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
-+
+ + 
-      return null;
-    }
@@ -442 +701 @@
-  };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
+
-else if (Prototype.Browser.Gecko) {
-  Element.Methods.setOpacity = function(element, value) {
@@ -482 +771 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-
-
+
+
+
+
+
+
+
+
-    },
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  }
-};
-
-(function() {
-
-
-
-
-
-
-
-
+
+
+
+
+
-  });
-attributeTranslations.value
+insertionTranslation
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-
+.read
-    attribute = t.names[attribute] || attribute;
-    node = $(element).getAttributeNode(attribute);
@@ -672 +1024 @@
-  
-  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache = {};
-};
-
-var Toggle = { display: Element.toggle };
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.Insertion = function(adjacency) {
-  this.adjacency = adjacency;
-}
-
-Abstract.Insertion.prototype = {
-  initialize: function(element, content) {
-    this.element = $(element);
-    this.content = content.stripScripts();
-    
-    if (this.adjacency && this.element.insertAdjacentHTML) {
-      try {
-        this.element.insertAdjacentHTML(this.adjacency, this.content);
-      } catch (e) {
-        var tagName = this.element.tagName.toUpperCase();
-        if (['TBODY', 'TR'].include(tagName)) {
-          this.insertContent(this.contentFromAnonymousTable());
-        } else {
-          throw e;
-        }
-      }
-    } else {
-      this.range = this.element.ownerDocument.createRange();
-      if (this.initializeRange) this.initializeRange();
-      this.insertContent([this.range.createContextualFragment(this.content)]);
-    }
-
-    content.evalScripts.bind(content).defer();   
-  },
-  
-  contentFromAnonymousTable: function() {
-    var div = document.createElement('div');
-    div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
-    return $A(div.childNodes[0].childNodes[0].childNodes);
-  }
-}
-
-var Insertion = new Object();
-
-Insertion.Before = Class.create();
-Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
-  initializeRange: function() {
-    this.range.setStartBefore(this.element);
-  },
-  
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment, this.element);
-    }).bind(this));
-  }
-});
-
-Insertion.Top = Class.create();
-Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(true);
-  },
-  
-  insertContent: function(fragments) {
-    fragments.reverse(false).each((function(fragment) {
-      this.element.insertBefore(fragment, this.element.firstChild);
-    }).bind(this));
-  }
-});
-
-Insertion.Bottom = Class.create();
-Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(this.element);
-  },
-  
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.appendChild(fragment);
-    }).bind(this));
-  }
-});
-
-Insertion.After = Class.create();
-Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
-  initializeRange: function() {
-    this.range.setStartAfter(this.element);
-  },
-  
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment, 
-        this.element.nextSibling);
-    }).bind(this));
-  }
-});
-
-/*--------------------------------------------------------------------------*/

spinoffs/prototype/trunk/src/enumerable.js

@@ -1 @@
-, $continue = new Error('"throw $continue" is deprecated, use "return" instead')
+
-
-var Enumerable = {

spinoffs/prototype/trunk/src/prototype.js

@@ -30 +30 @@
-<%= include 'enumerable.js', 'array.js', 'hash.js', 'range.js' %>
-
-position
+deprecated
-
-Element.addMethods();

spinoffs/prototype/trunk/src/string.js

@@ -83 +83 @@
-
-  unescapeHTML: function() {
-document.create
+new 
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ? 

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

@@ -30 +30 @@
-// <![CDATA[
-  var responderCounter = 0;
-
+
+
+
+
+
-  new Test.Unit.Runner({
-    
@@ -77 +81 @@
-      new Ajax.Updater("content", "fixtures/content.html", { method:'get' });
-      
-      // lowercase comparison because of MSIE which presents HTML tags in uppercase
-      var sentence = ("Pack my box with <em>five dozen</em> liquor jugs! " +
-        "Oh, how <strong>quickly</strong> daft jumping zebras vex...").toLowerCase();
-
-      wait(1000,function(){
-        assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
@@ -96 +96 @@
-          assertEqual("", $("content2").innerHTML);
-        });
+      }); 
+    }},
+    
+    testUpdaterWithInsertion: function() {with(this) {
+      $('content').update();
+      new Ajax.Updater("content", "fixtures/content.html", { method:'get', insertion: Insertion.Top });
+      wait(1000,function(){
+        assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
+        $('content').update();
+        new Ajax.Updater("content", "fixtures/content.html", { method:'get', insertion: 'bottom' });      
+        wait(1000,function(){
+          assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
+        });
-      });
-    }},
-
+   
-    testResponders: function(){with(this) {
-      // check for internal responder

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

@@ -147 +147 @@
-<div id="testdiv-replace-container-4"><div id="testdiv-replace-4"></div></div>
-<div id="testdiv-replace-container-5"><div id="testdiv-replace-5"></div></div>
+<div id="testform-replace-container"><p>some text</p><form id="testform-replace"><input id="testinput-replace" type="text" /></form><p>some text</p></div>
-
-<div id="element_with_visible_overflow" style="overflow:visible">V</div>
@@ -224 +225 @@
-</form>
-
+<!-- writeAttributes  -->
+<p id="write_attribute_para"></a>
+<a id="write_attribute_link" href="test.html"></a>
+<form action="/dev/null" id="write_attribute_form" method="get" accept-charset="utf-8">
+  <label id="write_attribute_label"></label>
+  <input type="checkbox" name="write_attribute_checkbox" value="" id="write_attribute_checkbox">
+  <input type="checkbox" checked="checked" name="write_attribute_checked_checkbox" value="" id="write_attribute_checked_checkbox">
+  <input type="text" name="write_attribute_input" value="" id="write_attribute_input">
+  <select id="write_attribute_select">
+    <option>Cat</option>
+    <option>Dog</option>
+  </select>
+</form>
+
+<table id="write_attribute_table">
+  <tr><td id="write_attribute_td">A</td><td>B</td></tr>
+  <tr><td>C</td></tr>
+  <tr><td>D</td><td>E</td><td>F</td></tr>
+</table>
+
-<div id="dom_attribute_precedence">
-  <form action="blech" method="post">
@@ -268 +289 @@
-<div id="ancestor"><div id="child"><div><div id="great-grand-child"></div></div></div></div>
-<div id="not-in-the-family"></div>
+
+<div id="insertions-container"><div id="insertions-main"><p>some content.</p></div></div>
+<div id="insertions-node-container"><div id="insertions-node-main"><p>some content.</p></div></div>
+<div id="element-insertions-container"><div id="element-insertions-main"><p>some content.</p></div></div>
+<table id="table_for_insertions"></table>
+<table id="table_for_row_insertions"><tr id="row_1"></tr></table>
+<form method="post" action="blah">
+  <select id="select_for_update" name="select_for_update">
+    <option>option 1</option>
+    <option>option 2</option>
+  </select>
+  <select id="select_for_insert_bottom" name="select_for_insert_bottom">
+    <option>option 1</option>
+    <option>option 2</option>
+  </select>
+  <select id="select_for_insert_top" name="select_for_insert_top">
+    <option>option 1</option>
+    <option>option 2</option>
+  </select>
+</form>
+<div id="wrap-container"><p id="wrap"></p></div>
+
+<!-- Positioning methods bench -->
+<div id="body_absolute" style="position: absolute; top: 10px; left: 10px">
+  <div id="absolute_absolute" style="position: absolute; top: 10px; left:10px"> </div>
+  <div id="absolute_relative" style="position: relative; top: 10px; left:10px">
+    <div style="height:10px">test<span id="inline">test</span></div>
+    <div id="absolute_relative_undefined"> </div>
+  </div>
+</div>
+ 
-<!-- Tests follow -->
-<script type="text/javascript" language="javascript" charset="utf-8">
@@ -273 +325 @@
-
-  var testVar = 'to be updated', testVar2 = '';
-
+
+
+
-  Element.addMethods({
-    hashBrowns: function(element) { return 'hash browns'; }
@@ -314 +368 @@
-      assertElementsMatch(document.getElementsByClassName('B', 'class_names_ul'));
-    }},
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      assert($('second_row').descendantOf('table'));
+      
+      $('a_cell').insert('hello world', 'top');
+      assert($('a_cell').innerHTML.startsWith('hello world'));
+      $('a_cell').insert('<td>hi planet</td>', 'after');
+      assertEqual('hi planet', $('a_cell').next().innerHTML);
+      $('table_for_insertions').insert('<tr><td>a cell!</td></tr>');
+      assert($('table_for_insertions').innerHTML.gsub('\r\n', '').toLowerCase().include('<tr><td>a cell!</td></tr>'));
+      $('row_1').insert('<tr></tr><tr></tr><tr><td>last</td></tr>', 'after');
+      assertEqual('last', $A($('table_for_row_insertions').getElementsByTagName('tr')).last().lastChild.innerHTML);
+    }},
+    
+    testElementInsertInSelect: function() {with(this) {
+      var selectTop = $('select_for_insert_top'), selectBottom = $('select_for_insert_bottom');
+      selectBottom.insert('<option value="33">option 33</option><option selected="selected">option 45</option>');
+      assertEqual('option 45', selectBottom.getValue());
+      selectTop.insert('<option value="A">option A</option><option value="B" selected="selected">option B</option>', 'top');
+      assertEqual(4, selectTop.options.length);
+    }},
+        
+    testElementMethodInsert: function() {with(this) {
+      $('element-insertions-main').insert('some text before','before');
+      assert(getInnerHTML('element-insertions-container').startsWith('some text before'));
+      $('element-insertions-main').insert('some text after', 'after');
+      assert(getInnerHTML('element-insertions-container').endsWith('some text after'));
+      $('element-insertions-main').insert('some text top', 'top');
+      assert(getInnerHTML('element-insertions-main').startsWith('some text top'));
+      $('element-insertions-main').insert('some text bottom', 'bottom');
+      assert(getInnerHTML('element-insertions-main').endsWith('some text bottom'));
+      
+      $('element-insertions-main').insert('some more text at the bottom');
+      assert(getInnerHTML('element-insertions-main').endsWith('some more text at the bottom'));
+    }},
+    
+    testInsertionBackwardsCompatibility: function() {with(this) {
+      new Insertion.Before('element-insertions-main', 'some backward-compatibility testing before');
+      assert(getInnerHTML('element-insertions-container').include('some backward-compatibility testing before'));
+      new Insertion.After('element-insertions-main', 'some backward-compatibility testing after');
+      assert(getInnerHTML('element-insertions-container').include('some backward-compatibility testing after'));
+      new Insertion.Top('element-insertions-main', 'some backward-compatibility testing top');
+      assert(getInnerHTML('element-insertions-main').startsWith('some backward-compatibility testing top'));
+      new Insertion.Bottom('element-insertions-main', 'some backward-compatibility testing bottom');
+      assert(getInnerHTML('element-insertions-main').endsWith('some backward-compatibility testing bottom'));
+    }},
+    
+    testElementWrap: function() {with(this) {
+      var element = $('wrap'), parent = document.createElement('div');
+      element.wrap('div');
+      assert(getInnerHTML('wrap-container').startsWith('<div><p'));
+      element.wrap(parent);
+      assert(getInnerHTML('wrap-container').startsWith('<div><div><p'));
+      assert(typeof parent.setStyle == 'function');
+      element.wrap();
+      assert(getInnerHTML('wrap-container').startsWith('<div><div><div><p'));
-    }},
-    
@@ -415 +555 @@
-    }},
-    
+    testElementUpdateInSelect: function() {with(this) {
+      var select = $('select_for_update');
+      select.update('<option value="3">option 3</option><option selected="selected">option 4</option>');
+      assertEqual('option 4', select.getValue());
+    }},
+    
-    testElementReplace: function() {with(this) {
-      $('testdiv-replace-1').replace('hello from div!');
@@ -420 +566 @@
-      
-      $('testdiv-replace-2').replace(123);
-
+;
-      
-      $('testdiv-replace-3').replace();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    testElementReplaceWithScript: function() {with(this) {
-      $('testdiv-replace-4').replace('hello from div!<script>testVarReplace="hello!"</'+'script>');