Changeset 6660

Timestamp:

05/05/07 09:39:19 (1 year ago)

Author:

tobie

Message:

Make Element#update work for SELECT tags in IE and Opera.

Files:

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

spinoffs/prototype/branches/dom/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make Element#update 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]

spinoffs/prototype/branches/dom/src/dom.js

@@ -662 +662 @@
-          element.appendChild(node)
-      });
+    } else if(tagName == 'SELECT') {
+      while (element.length > 0) element.remove(element.length - 1);
+      Element._getContentFromAnonymousSelect(html.stripScripts())
+        .each(function(option) { element.add(option) });
-    } else element.innerHTML = html.stripScripts();
-
-    html.evalScripts.bind(html).defer();
-    return element;
-  };
-}
+
+Element._getContentFromAnonymousSelect = function(html) {
+  var div = document.createElement('div');
+  div.innerHTML = '<select>' + html + '</select>';
+  return $A(div.firstChild.childNodes).map(function(o) {
+    return new Option(o.text, o.value === undefined ? o.value : o.text, o.selected, o.selected);
+  });
+};
-
-Element._getContentFromAnonymousTable = function(html, tagName) {

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

@@ -295 +295 @@
-<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>
+</form>
-<div id="wrap-container"><p id="wrap"></p></div>
-<!-- Tests follow -->
@@ -522 +528 @@
-    }},
-    
+    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!');