diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-02-06 11:52:29 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-02-12 12:38:31 +0200 |
commit | 1b328cbc26315577c0e27af6e63514ea762a8d7f (patch) | |
tree | 1cea48a58302e9a645a0e6fc5bd6894db5352f4d | |
parent | cbd09bd37c87539889f6be688276a84bc57e5bf5 (diff) | |
download | aconf-1b328cbc26315577c0e27af6e63514ea762a8d7f.tar.bz2 aconf-1b328cbc26315577c0e27af6e63514ea762a8d7f.tar.xz |
web client: statusbar module
-rw-r--r-- | web/client.js | 26 | ||||
-rw-r--r-- | web/statusbar.js | 26 |
2 files changed, 29 insertions, 23 deletions
diff --git a/web/client.js b/web/client.js index 25cf988..73983a4 100644 --- a/web/client.js +++ b/web/client.js @@ -5,6 +5,7 @@ requirejs.config({ baseUrl: "lib", + paths: {acf2: ".."}, shim: { underscore: {exports: "_"}, "jquery-bbq": {deps: ["jquery"]}, @@ -18,37 +19,16 @@ requirejs.config({ require( [ + "acf2/statusbar", "jquery", "underscore", "jquery-bbq", "jquery-blockui", "jquery-ui/sortable" ], - function($, _) { + function(statusBar, $, _) { $("#login").submit(function() { - var statusBar = (function() { - function set(status, msg, mode) { - $("#status").prop("class", status); - $("#status p").text(msg); - $("#logout").prop("class", mode ? "hidden" : null); - $("#status div").prop("class", mode == "txn" ? null : "hidden"); - $("#commit").prop("disabled", status == "invalid"); - } - - function setError(msg, mode) { set("invalid", msg, mode); }; - - return { - 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"); - } - } - })(); - $.ajax("/login", { type: "POST", data: JSON.stringify({ diff --git a/web/statusbar.js b/web/statusbar.js new file mode 100644 index 0000000..3488772 --- /dev/null +++ b/web/statusbar.js @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2012-2014 Kaarle Ritvanen + * See LICENSE file for license details + */ + +define(["jquery"], function($) { + function set(status, msg, mode) { + $("#status").prop("class", status); + $("#status p").text(msg); + $("#logout").prop("class", mode ? "hidden" : null); + $("#status div").prop("class", mode == "txn" ? null : "hidden"); + $("#commit").prop("disabled", status == "invalid"); + } + + function setError(msg, mode) { set("invalid", msg, mode); } + + return { + 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"); + } + }; +}); |