Changeset 6526

Timestamp:

04/15/07 23:08:02 (1 year ago)

Author:

mislav

Message:

sync form.js and its tests with prototype trunk:6504

Files:

• spinoffs/prototype/branches/form/src/form.js (modified) (5 diffs)
• spinoffs/prototype/branches/form/test/unit/form.html (modified) (3 diffs)

spinoffs/prototype/branches/form/src/form.js

@@ -9 +9 @@
-      if (!element.disabled && element.name) {
-        var key = element.name, value = $(element).getValue();
-
- 
+ 
+      
-            if (result[key].constructor != Array) result[key] = [result[key]];
-            result[key].push(value);
@@ -57 +57 @@
-  disable: function(form) {
-    form = $(form);
-
-
-
-
+
-    return form;
-  },
@@ -66 +63 @@
-  enable: function(form) {
-    form = $(form);
-
-
-
+
-    return form;
-  },
@@ -161 +156 @@
-  disable: function(element) {
-    element = $(element);
+    element.blur();
-    element.disabled = true;
-    return element;
@@ -167 +163 @@
-  enable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = false;
-    return element;

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

@@ -67 +67 @@
-</div>
-
-
-
+ 
+ 
-  <input type="text" name="twin" value="siamese" />
-  <!-- Rails checkbox hack with hidden input: -->
-
+ 
-  <input name="checky" type="hidden" value="0" />
-</form>
@@ -185 +185 @@
-    }},
-    
+    testFormEnabling: function(){ with(this) {
+      var form = $('form_focus')
+      var input1 = form.focus_disabled
+      var input2 = form.focus_text
+      
+      assert(input1.disabled)
+      assert(!input2.disabled)
+      
+      form.disable()
+      assert(input1.disabled)
+      assert(input2.disabled)
+      
+      form.enable()
+      assert(!input1.disabled)
+      assert(!input2.disabled)
+      
+      input1.disable()
+      assert(input1.disabled)
+      
+      // non-form elements:
+      var fieldset = $('form_fieldset')
+      var fields = fieldset.immediateDescendants()
+      assert(fields.all(function(select){ return !select.disabled }))
+      
+      Form.disable(fieldset)
+      assert(fields.all(function(select){ return select.disabled }))
+      
+      Form.enable(fieldset)
+      assert(fields.all(function(select){ return !select.disabled }))
+    }},
+    
-    testFormElementEnabling: function(){ with(this) {
-      assert($('input_disabled').disabled);
@@ -283 +314 @@
-
-      // Checks that select-related serializations work just fine
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }},
-