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

Proposed by Jonathan Jacobs
Status: Merged
Approved by: Tristan Seligmann
Approved revision: 146
Merged at revision: 145
Proposed branch: lp:~methanal-developers/methanal/form-actions-care-about-submitting
Merge into: lp:methanal
Diff against target: 50 lines (+14/-5)
1 file modified
methanal/js/Methanal/View.js (+14/-5)
To merge this branch: bzr merge lp:~methanal-developers/methanal/form-actions-care-about-submitting
Reviewer Review Type Date Requested Status
Tristan Seligmann Approve
Review via email: mp+30189@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tristan Seligmann (mithrandi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'methanal/js/Methanal/View.js'
2--- methanal/js/Methanal/View.js 2010-07-14 10:13:31 +0000
3+++ methanal/js/Methanal/View.js 2010-07-17 20:11:41 +0000
4@@ -918,16 +918,21 @@
5
6 self.clearError();
7 self.actions.disable();
8+ self.freeze();
9 self.actions.throbber.start();
10
11 var d = self.callRemote('invoke', data);
12 d.addBoth(function (value) {
13+ self.thaw();
14 self.actions.throbber.stop();
15- self.actions.enable();
16 return value;
17 });
18- d.addCallback(function (value) { return self.submitSuccess(value); });
19- d.addErrback(function (value) { return self.submitFailure(value); });
20+ d.addCallback(function (value) {
21+ return self.submitSuccess(value);
22+ });
23+ d.addErrback(function (value) {
24+ return self.submitFailure(value);
25+ });
26 return d;
27 },
28
29@@ -989,17 +994,21 @@
30
31
32 /**
33- * Callback for successful form submission.
34+ * Callback for successful form submission. The return value will be sent
35+ * back to the server.
36 */
37 function submitSuccess(self, value) {
38+ return null;
39 },
40
41
42 /**
43- * Callback for a failure form submission.
44+ * Callback for a failure form submission. The return value will be sent
45+ * back to the server.
46 */
47 function submitFailure(self, failure) {
48 self.setError(failure);
49+ return null;
50 },
51
52

Subscribers

People subscribed via source and target branches