diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-09-16 15:02:36 +0300 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-09-16 15:02:36 +0300 |
commit | f5d7f3107b446b8169e61a14cb1c584af3bed7dd (patch) | |
tree | 2f1b74c6b6215c26c93771571763daf95cf91d99 | |
parent | 15e6b65310f1ca84ae0ba6320067bdb7216ebb54 (diff) | |
download | aconf-f5d7f3107b446b8169e61a14cb1c584af3bed7dd.tar.bz2 aconf-f5d7f3107b446b8169e61a14cb1c584af3bed7dd.tar.xz |
web client: helper functions for deferred objects in transaction set, delete methods
-rw-r--r-- | web/client.js | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/web/client.js b/web/client.js index 8722899..fbb2cd8 100644 --- a/web/client.js +++ b/web/client.js @@ -124,6 +124,7 @@ $(function() { data.set = function(name, newValue) { var def = $.Deferred(); + function reject(xhr) { def.reject(xhr); } var mpath = join(path, name); var value = data.get(name); @@ -208,13 +209,11 @@ $(function() { ]; }); resolve(); - }).fail(function(xhr) { - def.reject(xhr); - }); + }).fail(reject); else resolve(); - }).fail(function(xhr) { def.reject(xhr); }); + }).fail(reject); } var prevTask; @@ -230,6 +229,8 @@ $(function() { data.delete = function(name) { var def = $.Deferred(); + function resolve(txnValid) { def.resolve(txnValid); } + function reject() { def.reject(); } var tasks = _.filter( _.pluck(_.values(invalid), 1), @@ -238,9 +239,7 @@ $(function() { if (tasks.length) tasks[0].always(function() { - data.delete(name).done(function(txnValid) { - def.resolve(txnValid); - }).fail(function() { def.reject(); }); + data.delete(name).done(resolve).fail(reject); }); else { @@ -276,9 +275,9 @@ $(function() { ); } } - def.resolve(txnValid); + resolve(txnValid); - }).fail(function() { def.reject(); }); + }).fail(reject); } return def; |