Changeset 572

Timestamp:

01/25/06 14:07:30 (3 years ago)

Author:

therve@gmail.com

Message:

Correct Bug in formContents

Files:

• mochikit/branches/scriptaculous/MochiKit/DOM.js (modified) (3 diffs)

mochikit/branches/scriptaculous/MochiKit/DOM.js

@@ -218 +218 @@
-};
-
-
+2
-    var names = [];
-    var values = [];
@@ -238 +238 @@
-            }
-            if (elem.tagName == "SELECT") {
-
-
-
-
-
+
+
+
+
+
+
-                    }
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-            } else {
@@ -257 +267 @@
-    return [names, values];
-};
+
+MochiKit.DOM.formContents = function (elem/* = document */) {
+    var names = [];
+    var values = [];
+    var m = MochiKit.Base;
+    var self = MochiKit.DOM;
+    if (typeof(elem) == "undefined" || elem == null) {
+        elem = self._document;
+    } else {
+        elem = self.getElement(elem);
+    }
+    m.nodeWalk(elem, function (elem) {
+        var name = elem.name;
+        if (m.isNotEmpty(name)) {
+            var tagName = elem.nodeName;
+            if (tagName == "INPUT"
+                && (elem.type == "radio" || elem.type == "checkbox")
+                && !elem.checked
+            ) {
+                return null;
+            }
+            if (tagName == "SELECT") {
+                if (elem.type == "select-one") {
+                    var index = elem.selectedIndex;
+                    if (index >= 0) {
+                        var opt = elem.options[index];
+                        names.push(name);
+                        values.push((opt.value) ? opt.value : opt.text);
+                    }
+                    return null;
+                } else {
+                    var opts = elem.options;
+                    for (var i=0; i < opts.length; i++) {
+                        var opt = opts[i];
+                        if (!opt.selected) {
+                            continue;
+                        }
+                        names.push(name);
+                        values.push((opt.value) ? opt.value : opt.text);
+                    }
+                    return null;
+                }
+            }
+            if (tagName == "FORM" || tagName == "P" || tagName == "SPAN"
+                || tagName == "DIV"
+            ) {
+                return elem.childNodes;
+            }
+            names.push(name);
+            values.push(elem.value || '');
+            return null;
+        }
+        return elem.childNodes;
+    });
+    return [names, values];
+};
+
-
-MochiKit.DOM.withDocument = function (doc, func) {