summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-09-18 21:30:09 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-09-18 21:30:09 +0300
commit561ce9075457cda0253d32874b5989afd051ff7a (patch)
treef9af3c9c2b327aa94c44152c3d2e0fbe350ece9e
parent997839c6b1df18db9d17cc0d279d4381a776a762 (diff)
downloadaconf-561ce9075457cda0253d32874b5989afd051ff7a.tar.bz2
aconf-561ce9075457cda0253d32874b5989afd051ff7a.tar.xz
web client: validation completion handler for status bar object
-rw-r--r--web/client.js27
1 files changed, 13 insertions, 14 deletions
diff --git a/web/client.js b/web/client.js
index 7f779f6..b864997 100644
--- a/web/client.js
+++ b/web/client.js
@@ -15,12 +15,16 @@ $(function() {
$("#commit").prop("disabled", status == "invalid");
}
+ function setError(msg, mode) { set("invalid", msg, mode); };
+
return {
- enableCommit: function() {
- set("changed", "You have uncommitted changes", "txn");
- },
- setError: function(msg, mode) { set("invalid", msg, mode); },
- reset: function() { set(null, ""); }
+ reset: function() { set(null, ""); },
+ setError: setError,
+ validationReady: function(txnValid) {
+ if (txnValid)
+ set("changed", "You have uncommitted changes", "txn");
+ else setError("Some values need checking", "txn");
+ }
}
})();
@@ -528,11 +532,6 @@ $(function() {
if (!isTreeNode(data.meta))
return target.append(JSON.stringify(data));
- function validated(txnValid) {
- if (txnValid) statusBar.enableCommit();
- else statusBar.setError("Some values need checking", "txn");
- }
-
var div = $("<div>");
target.append(div);
@@ -569,7 +568,7 @@ $(function() {
data.set(name, widget.get()).done(function(txnValid) {
widget.setMessage("");
widget.setStatus(data.status(name));
- validated(txnValid);
+ statusBar.validationReady(txnValid);
}).fail(function(xhr) {
if (_.isString(xhr)) widget.setMessage(xhr);
@@ -591,7 +590,7 @@ $(function() {
else widget.setMessage(formatError("Error", xhr));
widget.setStatus("invalid");
- validated(false);
+ statusBar.validationReady(false);
});
}
@@ -601,7 +600,7 @@ $(function() {
change,
removable ? function() {
data.delete(name).done(function(txnValid) {
- validated(txnValid)
+ statusBar.validationReady(txnValid)
fetchAndRender(path);
});
} : null,
@@ -677,7 +676,7 @@ $(function() {
data.meta
);
button.prop("class", null);
- validated(txnValid);
+ statusBar.validationReady(txnValid);
});
}