Merge lp:~methanal-developers/methanal/form-actions-care-about-submitting into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2010-07-14 10:13:31 +0000
+++ methanal/js/Methanal/View.js	2010-07-17 20:11:41 +0000
@@ -918,16 +918,21 @@
 
         self.clearError();
         self.actions.disable();
+        self.freeze();
         self.actions.throbber.start();
 
         var d = self.callRemote('invoke', data);
         d.addBoth(function (value) {
+            self.thaw();
             self.actions.throbber.stop();
-            self.actions.enable();
             return value;
         });
-        d.addCallback(function (value) { return self.submitSuccess(value); });
-        d.addErrback(function (value) { return self.submitFailure(value); });
+        d.addCallback(function (value) {
+            return self.submitSuccess(value);
+        });
+        d.addErrback(function (value) {
+            return self.submitFailure(value);
+        });
         return d;
     },
 
@@ -989,17 +994,21 @@
 
 
     /**
-     * Callback for successful form submission.
+     * Callback for successful form submission. The return value will be sent
+     * back to the server.
      */
     function submitSuccess(self, value) {
+        return null;
     },
 
 
     /**
-     * Callback for a failure form submission.
+     * Callback for a failure form submission. The return value will be sent
+     * back to the server.
      */
     function submitFailure(self, failure) {
         self.setError(failure);
+        return null;
     },