Merge lp:~methanal-developers/methanal/control-reset into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

35 + self.inputNode.checked = value !== undefined && value !== null;

This sets checked to true if value is false; that doesn't seem to make much sense to me. How about:

self.inputNode.checked = !!value;

review: Needs Fixing

[lp:~methanal-developers/methanal/control-reset]

133. By Jonathan Jacobs on 2010-02-23

Fix broken boolean logic for CheckboxInput.setValue.

[Jonathan Jacobs (jjacobs)]

> 35 + self.inputNode.checked = value !== undefined && value !== null;
>
> This sets checked to true if value is false; that doesn't seem to make much
> sense to me. How about:
>
> self.inputNode.checked = !!value;

Quite right. Done.

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2010-02-22 09:05:55 +0000
+++ methanal/js/Methanal/View.js	2010-02-23 14:25:25 +0000
@@ -783,10 +783,6 @@
      * Reset form inputs to their initial values.
      */
     function reset(self) {
-        // XXX: Use the DOM function to reset for values that might not
-        // otherwise be reset, like password confirmations etc. Ideally
-        // each control's reset method should take care of these.
-        self.node.reset();
         for (var name in self.controls) {
             self.getControl(name).reset();
         }
@@ -1670,6 +1666,14 @@
     },
 
 
+    function reset(self) {
+        Methanal.View.PrePopulatingTextInput.upcall(self, 'reset');
+        var targetControl = self.getTargetControl();
+        targetControl.setValue(self.inputNode.value);
+        targetControl.onChange(targetControl.inputNode);
+    },
+
+
     /**
      * Get the instance of the target control.
      */
@@ -1699,6 +1703,11 @@
  * Checkbox input.
  */
 Methanal.View.FormInput.subclass(Methanal.View, 'CheckboxInput').methods(
+    function setValue(self, value) {
+        self.inputNode.checked = !!value;
+    },
+
+
     function getValue(self) {
         return self.inputNode.checked;
     });
@@ -1755,6 +1764,12 @@
  * A dropdown input.
  */
 Methanal.View.FormInput.subclass(Methanal.View, 'SelectInput').methods(
+    function __init__(self, node, args) {
+        Methanal.View.SelectInput.upcall(self, '__init__', node, args);
+        self._placeholderInserted = false;
+    },
+
+
     /**
      * Create an C{option} DOM node.
      *
@@ -1778,9 +1793,17 @@
      * Insert a placeholder C{option} node.
      */
     function _insertPlaceholder(self) {
-        var optionNode = self.insert(
-            '', self.label, self.inputNode.options[0] || null);
+        if (self._placeholderInserted) {
+            return;
+        }
+
+        var before = self.inputNode.getElementsByTagName('optgroup')[0];
+        if (before === undefined) {
+            before = self.inputNode.options[0];
+        }
+        var optionNode = self.insert('', self.label, before || null);
         Methanal.Util.addElementClass(optionNode, 'embedded-label');
+        self._placeholderInserted = true;
     },
 
 
@@ -1807,7 +1830,9 @@
             if (before !== null) {
                 // In browsers before IE8, the second argument to "add" is an
                 // *index*. Great, thanks IE!
-                index = before.index;
+
+                // The index of an OPTGROUP is always -1, great.
+                index = before.tagName == 'OPTGROUP' ? 0 : before.index;
             }
             self.inputNode.add(optionNode, index);
         }
@@ -2212,6 +2237,12 @@
     },
 
 
+    function reset(self) {
+        Methanal.View.VerifiedPasswordInput.upcall(self, 'reset');
+        self._confirmPasswordNode.value = self.inputNode.value;
+    },
+
+
     /**
      * Set the password strength criteria.
      *

=== modified file 'methanal/view.py'
--- methanal/view.py	2010-02-22 21:30:22 +0000
+++ methanal/view.py	2010-02-23 14:25:25 +0000
@@ -92,6 +92,7 @@
     L{LiveForm} action for resetting a form's controls.
     """
     jsClass = u'Methanal.View.ResetAction'
+    allowViewOnly = True
     defaultName = u'Reset'
     type = 'reset'