X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fluci2.js;h=e47f5bdc9199ac62a7c834a412f9255bd413cb40;hp=a012e5f662d3479579c090dd281b0058ed089271;hb=e93a839d17e933f970baf9b2481817d0598e1746;hpb=2f0e65dd27549ef4fde5b18588083968a59b66bd
diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js
index a012e5f..e47f5bd 100644
--- a/luci2/htdocs/luci2/luci2.js
+++ b/luci2/htdocs/luci2/luci2.js
@@ -175,53 +175,7 @@ String.prototype.format = function()
function LuCI2()
{
- var _luci2 = this;
-
- var alphacmp = function(a, b)
- {
- if (a < b)
- return -1;
- else if (a > b)
- return 1;
- else
- return 0;
- };
-
- var retcb = function(cb, rv)
- {
- if (typeof(cb) == 'function')
- cb(rv);
-
- return rv;
- };
-
- var isa = function(x, t)
- {
- if (typeof(x) != 'string' && typeof(t) == 'string')
- return (Object.prototype.toString.call(x) == '[object ' + t + ']');
-
- return (Object.prototype.toString.call(x) == Object.prototype.toString.call(t));
- };
-
- var rcall = function(obj, func, params, res_attr, res_default, cb, filter)
- {
- if (typeof(params) == 'undefined')
- params = { };
-
- return _luci2.rpc.call(obj, func, params).then(function(res) {
- if (res[0] != 0 || typeof(res[1]) == 'undefined')
- return retcb(cb, res_default);
-
- var rv = (typeof(res_attr) != 'undefined') ? res[1][res_attr] : res[1];
- if (typeof(rv) == 'undefined' || (typeof(res_default) != 'undefined' && !isa(rv, res_default)))
- return retcb(cb, res_default);
-
- if (typeof(filter) == 'function')
- rv = filter(rv);
-
- return retcb(cb, rv);
- });
- };
+ var L = this;
var Class = function() { };
@@ -260,7 +214,7 @@ function LuCI2()
_class.prototype = prototype;
_class.prototype.constructor = _class;
- _class.extend = arguments.callee;
+ _class.extend = Class.extend;
return _class;
};
@@ -274,7 +228,7 @@ function LuCI2()
return obj;
};
- this.deferred = function(x)
+ this.isDeferred = function(x)
{
return (typeof(x) == 'object' &&
typeof(x.then) == 'function' &&
@@ -283,7 +237,7 @@ function LuCI2()
this.deferrable = function()
{
- if (this.deferred(arguments[0]))
+ if (this.isDeferred(arguments[0]))
return arguments[0];
var d = $.Deferred();
@@ -299,42 +253,42 @@ function LuCI2()
plural: function(n) { return 0 + (n != 1) },
init: function() {
- if (_luci2.i18n.loaded)
+ if (L.i18n.loaded)
return;
var lang = (navigator.userLanguage || navigator.language || 'en').toLowerCase();
var langs = (lang.indexOf('-') > -1) ? [ lang, lang.split(/-/)[0] ] : [ lang ];
for (var i = 0; i < langs.length; i++)
- $.ajax('%s/i18n/base.%s.json'.format(_luci2.globals.resource, langs[i]), {
+ $.ajax('%s/i18n/base.%s.json'.format(L.globals.resource, langs[i]), {
async: false,
cache: true,
dataType: 'json',
success: function(data) {
- $.extend(_luci2.i18n.catalog, data);
+ $.extend(L.i18n.catalog, data);
- var pe = _luci2.i18n.catalog[''];
+ var pe = L.i18n.catalog[''];
if (pe)
{
- delete _luci2.i18n.catalog[''];
+ delete L.i18n.catalog[''];
try {
var pf = new Function('n', 'return 0 + (' + pe + ')');
- _luci2.i18n.plural = pf;
+ L.i18n.plural = pf;
} catch (e) { };
}
}
});
- _luci2.i18n.loaded = true;
+ L.i18n.loaded = true;
}
};
this.tr = function(msgid)
{
- _luci2.i18n.init();
+ L.i18n.init();
- var msgstr = _luci2.i18n.catalog[msgid];
+ var msgstr = L.i18n.catalog[msgid];
if (typeof(msgstr) == 'undefined')
return msgid;
@@ -346,23 +300,23 @@ function LuCI2()
this.trp = function(msgid, msgid_plural, count)
{
- _luci2.i18n.init();
+ L.i18n.init();
- var msgstr = _luci2.i18n.catalog[msgid];
+ var msgstr = L.i18n.catalog[msgid];
if (typeof(msgstr) == 'undefined')
return (count == 1) ? msgid : msgid_plural;
else if (typeof(msgstr) == 'string')
return msgstr;
else
- return msgstr[_luci2.i18n.plural(count)];
+ return msgstr[L.i18n.plural(count)];
};
this.trc = function(msgctx, msgid)
{
- _luci2.i18n.init();
+ L.i18n.init();
- var msgstr = _luci2.i18n.catalog[msgid + '\u0004' + msgctx];
+ var msgstr = L.i18n.catalog[msgid + '\u0004' + msgctx];
if (typeof(msgstr) == 'undefined')
return msgid;
@@ -374,16 +328,16 @@ function LuCI2()
this.trcp = function(msgctx, msgid, msgid_plural, count)
{
- _luci2.i18n.init();
+ L.i18n.init();
- var msgstr = _luci2.i18n.catalog[msgid + '\u0004' + msgctx];
+ var msgstr = L.i18n.catalog[msgid + '\u0004' + msgctx];
if (typeof(msgstr) == 'undefined')
return (count == 1) ? msgid : msgid_plural;
else if (typeof(msgstr) == 'string')
return msgstr;
else
- return msgstr[_luci2.i18n.plural(count)];
+ return msgstr[L.i18n.plural(count)];
};
this.setHash = function(key, value)
@@ -410,8 +364,10 @@ function LuCI2()
h += keys[i] + ':' + data[keys[i]];
}
- if (h)
+ if (h.length)
location.hash = '#' + h;
+ else
+ location.hash = '';
};
this.getHash = function(key)
@@ -432,600 +388,1090 @@ function LuCI2()
return data;
};
- this.globals = {
- resource: '/luci2'
+ this.toArray = function(x)
+ {
+ switch (typeof(x))
+ {
+ case 'number':
+ case 'boolean':
+ return [ x ];
+
+ case 'string':
+ var r = [ ];
+ var l = x.split(/\s+/);
+ for (var i = 0; i < l.length; i++)
+ if (l[i].length > 0)
+ r.push(l[i]);
+ return r;
+
+ case 'object':
+ if ($.isArray(x))
+ {
+ var r = [ ];
+ for (var i = 0; i < x.length; i++)
+ r.push(x[i]);
+ return r;
+ }
+ else if ($.isPlainObject(x))
+ {
+ var r = [ ];
+ for (var k in x)
+ if (x.hasOwnProperty(k))
+ r.push(k);
+ return r.sort();
+ }
+ }
+
+ return [ ];
};
- this.rpc = {
+ this.toObject = function(x)
+ {
+ switch (typeof(x))
+ {
+ case 'number':
+ case 'boolean':
+ return { x: true };
+
+ case 'string':
+ var r = { };
+ var l = x.split(/\x+/);
+ for (var i = 0; i < l.length; i++)
+ if (l[i].length > 0)
+ r[l[i]] = true;
+ return r;
+
+ case 'object':
+ if ($.isArray(x))
+ {
+ var r = { };
+ for (var i = 0; i < x.length; i++)
+ r[x[i]] = true;
+ return r;
+ }
+ else if ($.isPlainObject(x))
+ {
+ return x;
+ }
+ }
- _msg_id: 1,
+ return { };
+ };
- _wrap_msg: function(method, object, func, args)
- {
- if (typeof(args) != 'object')
- args = { };
+ this.filterArray = function(array, item)
+ {
+ if (!$.isArray(array))
+ return [ ];
- return {
- id: _luci2.rpc._msg_id++,
- jsonrpc: "2.0",
- method: method,
- params: (method == 'call') ? [ _luci2.globals.sid, object, func, args ] : object
- };
- },
+ for (var i = 0; i < array.length; i++)
+ if (array[i] === item)
+ array.splice(i--, 1);
- _parse_response: function(keys, priv)
- {
- return function(data) {
- var obj;
- try {
- obj = $.parseJSON(data);
- } catch(e) { }
+ return array;
+ };
- if (typeof(obj) != 'object')
- return undefined;
+ this.toClassName = function(str, suffix)
+ {
+ var n = '';
+ var l = str.split(/[\/.]/);
- /* is a batched response */
- if (keys)
- {
- var rv = { };
- for (var i = 0; i < obj.length; i++)
- {
- var p = (typeof(priv) != 'undefined') ? priv[i] : undefined;
+ for (var i = 0; i < l.length; i++)
+ if (l[i].length > 0)
+ n += l[i].charAt(0).toUpperCase() + l[i].substr(1).toLowerCase();
- if ($.isArray(obj[i].result) && typeof(priv) != 'undefined')
- obj[i].result[2] = p;
+ if (typeof(suffix) == 'string')
+ n += suffix;
- if (obj[i].jsonrpc != '2.0' || obj[i].error || !obj[i].result)
- rv[keys[i]] = [ 4 /* UBUS_STATUS_NO_DATA */, undefined, p ];
- else
- rv[keys[i]] = obj[i].result;
- }
- return rv;
- }
+ return n;
+ };
- if (obj.jsonrpc != '2.0' || obj.error || !obj.result)
- return [ 4 /* UBUS_STATUS_NO_DATA */, undefined, priv ];
+ this.toColor = function(str)
+ {
+ if (typeof(str) != 'string' || str.length == 0)
+ return '#CCCCCC';
- if ($.isArray(obj.result) && typeof(priv) != 'undefined')
- obj.result[2] = priv;
+ if (str == 'wan')
+ return '#F09090';
+ else if (str == 'lan')
+ return '#90F090';
- return obj.result;
- };
- },
+ var i = 0, hash = 0;
- _post_msg: function(message, cb, keys, priv)
- {
- return $.ajax('/ubus', {
- cache: false,
- contentType: 'application/json',
- data: JSON.stringify(message),
- dataFilter: _luci2.rpc._parse_response(keys, priv),
- dataType: 'text',
- success: cb,
- type: 'POST'
- });
- },
+ while (i < str.length)
+ hash = str.charCodeAt(i++) + ((hash << 5) - hash);
- _post_single: function(object, method, args, cb, priv)
- {
- var msg = _luci2.rpc._wrap_msg('call', object, method, args, priv);
- return _luci2.rpc._post_msg(msg, cb, undefined, priv);
- },
+ var r = (hash & 0xFF) % 128;
+ var g = ((hash >> 8) & 0xFF) % 128;
+
+ var min = 0;
+ var max = 128;
+
+ if ((r + g) < 128)
+ min = 128 - r - g;
+ else
+ max = 255 - r - g;
+
+ var b = min + (((hash >> 16) & 0xFF) % (max - min));
+
+ return '#%02X%02X%02X'.format(0xFF - r, 0xFF - g, 0xFF - b);
+ };
+
+ this.parseIPv4 = function(str)
+ {
+ if ((typeof(str) != 'string' && !(str instanceof String)) ||
+ !str.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/))
+ return undefined;
- _post_batch: function(methods, cb)
+ var num = [ ];
+ var parts = str.split(/\./);
+
+ for (var i = 0; i < parts.length; i++)
{
- if (typeof(methods) != 'object')
+ var n = parseInt(parts[i], 10);
+ if (isNaN(n) || n > 255)
return undefined;
- var msgs = [ ];
- var keys = [ ];
- var priv = [ ];
+ num.push(n);
+ }
+
+ return num;
+ };
+
+ this.parseIPv6 = function(str)
+ {
+ if ((typeof(str) != 'string' && !(str instanceof String)) ||
+ !str.match(/^[a-fA-F0-9:]+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/))
+ return undefined;
+
+ var parts = str.split(/::/);
+ if (parts.length == 0 || parts.length > 2)
+ return undefined;
- for (var k in methods)
+ var lnum = [ ];
+ if (parts[0].length > 0)
+ {
+ var left = parts[0].split(/:/);
+ for (var i = 0; i < left.length; i++)
{
- if (typeof(methods[k]) != 'object' || methods[k].length < 2)
- continue;
+ var n = parseInt(left[i], 16);
+ if (isNaN(n))
+ return undefined;
- keys.push(k);
- priv.push(methods[k][3]);
- msgs.push(_luci2.rpc._wrap_msg('call', methods[k][0], methods[k][1], methods[k][2]));
+ lnum.push((n / 256) >> 0);
+ lnum.push(n % 256);
}
+ }
- if (msgs.length > 0)
- return _luci2.rpc._post_msg(msgs, cb, keys, priv);
+ var rnum = [ ];
+ if (parts.length > 1 && parts[1].length > 0)
+ {
+ var right = parts[1].split(/:/);
- return _luci2.deferrable([ ]);
- },
+ for (var i = 0; i < right.length; i++)
+ {
+ if (right[i].indexOf('.') > 0)
+ {
+ var addr = L.parseIPv4(right[i]);
+ if (!addr)
+ return undefined;
- call: function()
- {
- var a = arguments;
- if (typeof a[0] == 'string')
- return _luci2.rpc._post_single(a[0], a[1], a[2], a[3], a[4]);
- else
- return _luci2.rpc._post_batch(a[0], a[1]);
- },
+ rnum.push.apply(rnum, addr);
+ continue;
+ }
- list: function(objects)
- {
- var msg = _luci2.rpc._wrap_msg('list', objects);
- return _luci2.rpc._post_msg(msg);
- },
+ var n = parseInt(right[i], 16);
+ if (isNaN(n))
+ return undefined;
- access: function(scope, object, method, cb)
- {
- return _luci2.rpc._post_single('session', 'access', {
- 'sid': _luci2.globals.sid,
- 'scope': scope,
- 'object': object,
- 'function': method
- }, function(rv) {
- return retcb(cb, (rv[0] == 0 && rv[1] && rv[1].access == true));
- });
+ rnum.push((n / 256) >> 0);
+ rnum.push(n % 256);
+ }
}
+
+ if (rnum.length > 0 && (lnum.length + rnum.length) > 15)
+ return undefined;
+
+ var num = [ ];
+
+ num.push.apply(num, lnum);
+
+ for (var i = 0; i < (16 - lnum.length - rnum.length); i++)
+ num.push(0);
+
+ num.push.apply(num, rnum);
+
+ if (num.length > 16)
+ return undefined;
+
+ return num;
};
- this.uci = {
+ this.isNetmask = function(addr)
+ {
+ if (!$.isArray(addr))
+ return false;
- writable: function(cb)
- {
- return _luci2.rpc.access('ubus', 'uci', 'commit', cb);
- },
+ var c;
- add: function(config, type, cb)
- {
- return rcall('uci', 'add', { config: config, type: type }, 'section', '', cb);
- },
+ for (c = 0; (c < addr.length) && (addr[c] == 255); c++);
+
+ if (c == addr.length)
+ return true;
- apply: function()
+ if ((addr[c] == 254) || (addr[c] == 252) || (addr[c] == 248) ||
+ (addr[c] == 240) || (addr[c] == 224) || (addr[c] == 192) ||
+ (addr[c] == 128) || (addr[c] == 0))
{
+ for (c++; (c < addr.length) && (addr[c] == 0); c++);
- },
+ if (c == addr.length)
+ return true;
+ }
- changes: function(config)
- {
- return rcall('uci', 'changes', { config: config }, 'changes', [ ], cb);
- },
+ return false;
+ };
+
+ this.globals = {
+ timeout: 15000,
+ resource: '/luci2',
+ sid: '00000000000000000000000000000000'
+ };
+
+ this.rpc = {
- commit: function(config)
+ _id: 1,
+ _batch: undefined,
+ _requests: { },
+
+ _call: function(req, cb)
{
- return rcall('uci', 'commit', { config: config }, undefined, undefined, cb);
+ return $.ajax('/ubus', {
+ cache: false,
+ contentType: 'application/json',
+ data: JSON.stringify(req),
+ dataType: 'json',
+ type: 'POST',
+ timeout: L.globals.timeout,
+ _rpc_req: req
+ }).then(cb, cb);
},
- 'delete': function(config, section, option)
+ _list_cb: function(msg)
{
- var req = { config: config, section: section };
+ var list = msg.result;
- if (isa(option, 'Array'))
- req.options = option;
- else
- req.option = option;
+ /* verify message frame */
+ if (typeof(msg) != 'object' || msg.jsonrpc != '2.0' || !msg.id || !$.isArray(list))
+ list = [ ];
- return rcall('uci', 'delete', req, undefined, undefined, cb);
+ return $.Deferred().resolveWith(this, [ list ]);
},
- delete_all: function(config, type, matches)
+ _call_cb: function(msg)
{
- return rcall('uci', 'delete', { config: config, type: type, match: matches }, undefined, undefined, cb);
- },
+ var data = [ ];
+ var type = Object.prototype.toString;
+ var reqs = this._rpc_req;
- foreach: function(config, type, cb)
- {
- return rcall('uci', 'get', { config: config, type: type }, 'values', { }, function(sections) {
- for (var s in sections)
- cb(sections[s]);
- });
- },
+ if (!$.isArray(reqs))
+ {
+ msg = [ msg ];
+ reqs = [ reqs ];
+ }
- get: function(config, section, option, cb)
- {
- return rcall('uci', 'get', { config: config, section: section, option: option }, undefined, { }, function(res) {
- if (typeof(option) == 'undefined')
- return retcb(cb, (res.values && res.values['.type']) ? res.values['.type'] : undefined);
+ for (var i = 0; i < msg.length; i++)
+ {
+ /* fetch related request info */
+ var req = L.rpc._requests[reqs[i].id];
+ if (typeof(req) != 'object')
+ throw 'No related request for JSON response';
- return retcb(cb, res.value);
- });
- },
+ /* fetch response attribute and verify returned type */
+ var ret = undefined;
- get_all: function(config, section, cb)
- {
- return rcall('uci', 'get', { config: config, section: section }, 'values', { }, cb);
- },
+ /* verify message frame */
+ if (typeof(msg[i]) == 'object' && msg[i].jsonrpc == '2.0')
+ if ($.isArray(msg[i].result) && msg[i].result[0] == 0)
+ ret = (msg[i].result.length > 1) ? msg[i].result[1] : msg[i].result[0];
- get_first: function(config, type, option, cb)
- {
- return rcall('uci', 'get', { config: config, type: type }, 'values', { }, function(sections) {
- for (var s in sections)
+ if (req.expect)
{
- var val = (typeof(option) == 'string') ? sections[s][option] : sections[s]['.name'];
+ for (var key in req.expect)
+ {
+ if (typeof(ret) != 'undefined' && key != '')
+ ret = ret[key];
+
+ if (typeof(ret) == 'undefined' || type.call(ret) != type.call(req.expect[key]))
+ ret = req.expect[key];
- if (typeof(val) != 'undefined')
- return retcb(cb, val);
+ break;
+ }
}
- return retcb(cb, undefined);
- });
- },
+ /* apply filter */
+ if (typeof(req.filter) == 'function')
+ {
+ req.priv[0] = ret;
+ req.priv[1] = req.params;
+ ret = req.filter.apply(L.rpc, req.priv);
+ }
- section: function(config, type, name, values, cb)
- {
- return rcall('uci', 'add', { config: config, type: type, name: name, values: values }, 'section', undefined, cb);
+ /* store response data */
+ if (typeof(req.index) == 'number')
+ data[req.index] = ret;
+ else
+ data = ret;
+
+ /* delete request object */
+ delete L.rpc._requests[reqs[i].id];
+ }
+
+ return $.Deferred().resolveWith(this, [ data ]);
},
- set: function(config, section, option, value, cb)
+ list: function()
{
- if (typeof(value) == 'undefined' && typeof(option) == 'string')
- return rcall('uci', 'add', { config: config, section: section, type: option }, undefined, undefined, cb);
- else if (isa(option, 'Object'))
- return rcall('uci', 'set', { config: config, section: section, values: option }, undefined, undefined, cb);
- else
+ var params = [ ];
+ for (var i = 0; i < arguments.length; i++)
+ params[i] = arguments[i];
- var values = { };
- values[option] = value;
+ var msg = {
+ jsonrpc: '2.0',
+ id: this._id++,
+ method: 'list',
+ params: (params.length > 0) ? params : undefined
+ };
- return rcall('uci', 'set', { config: config, section: section, values: values }, undefined, undefined, cb);
+ return this._call(msg, this._list_cb);
},
- order: function(config, sections, cb)
+ batch: function()
{
- return rcall('uci', 'order', { config: config, sections: sections }, undefined, undefined, cb);
- }
- };
+ if (!$.isArray(this._batch))
+ this._batch = [ ];
+ },
- this.network = {
- getNetworkStatus: function(cb)
+ flush: function()
{
- var ifaces = [ ];
- var assign = function(target, key)
- {
- return function(value) {
- if (typeof(value) != 'undefined' && !$.isEmptyObject(value))
- target[key] = value;
- };
- };
+ if (!$.isArray(this._batch))
+ return L.deferrable([ ]);
- return _luci2.rpc.list().then(function(data) {
- var requests = [ ];
+ var req = this._batch;
+ delete this._batch;
- for (var i = 0; i < data.length; i++)
- {
- if (data[i].indexOf('network.interface.') != 0)
- continue;
+ /* call rpc */
+ return this._call(req, this._call_cb);
+ },
- var ifname = data[i].substring(18);
- if (ifname == 'loopback')
- continue;
+ declare: function(options)
+ {
+ var _rpc = this;
- var iface = { 'name': ifname };
+ return function() {
+ /* build parameter object */
+ var p_off = 0;
+ var params = { };
+ if ($.isArray(options.params))
+ for (p_off = 0; p_off < options.params.length; p_off++)
+ params[options.params[p_off]] = arguments[p_off];
- ifaces.push(iface);
- requests.push(['network.interface', 'status', { 'interface': ifname }, iface]);
- }
+ /* all remaining arguments are private args */
+ var priv = [ undefined, undefined ];
+ for (; p_off < arguments.length; p_off++)
+ priv.push(arguments[p_off]);
- return _luci2.rpc.call(requests, function(responses) {
- for (var key in responses)
- if (responses[key][0] == 0 && responses[key][1] && responses[key][2])
- $.extend(responses[key][2], responses[key][1]);
- });
- }).then(function() {
- var requests = [ ];
+ /* store request info */
+ var req = _rpc._requests[_rpc._id] = {
+ expect: options.expect,
+ filter: options.filter,
+ params: params,
+ priv: priv
+ };
+
+ /* build message object */
+ var msg = {
+ jsonrpc: '2.0',
+ id: _rpc._id++,
+ method: 'call',
+ params: [
+ L.globals.sid,
+ options.object,
+ options.method,
+ params
+ ]
+ };
- for (var i = 0; i < ifaces.length; i++)
+ /* when a batch is in progress then store index in request data
+ * and push message object onto the stack */
+ if ($.isArray(_rpc._batch))
{
- var iface = ifaces[i];
+ req.index = _rpc._batch.push(msg) - 1;
+ return L.deferrable(msg);
+ }
- var dev = iface.l3_device || iface.l2_device;
- if (!dev)
- continue;
+ /* call rpc */
+ return _rpc._call(msg, _rpc._call_cb);
+ };
+ }
+ };
- iface.device = { 'name': dev };
- requests[dev] = ['network.device', 'status', { 'name': dev }, iface.device];
- }
+ this.UCIContext = Class.extend({
- return _luci2.rpc.call(requests, function(responses) {
- for (var key in responses)
- if (responses[key][0] == 0 && responses[key][1] && responses[key][2])
- $.extend(responses[key][2], responses[key][1]);
- });
- }).then(function() {
- var requests = [ ];
+ init: function()
+ {
+ this.state = {
+ newidx: 0,
+ values: { },
+ creates: { },
+ changes: { },
+ deletes: { },
+ reorder: { }
+ };
+ },
- for (var i = 0; i < ifaces.length; i++)
- {
- var iface = ifaces[i];
- if (!iface.device)
- continue;
+ _load: L.rpc.declare({
+ object: 'uci',
+ method: 'get',
+ params: [ 'config' ],
+ expect: { values: { } }
+ }),
- var subdevs = iface.device['bridge-members'];
- if (!subdevs)
- continue;
+ _order: L.rpc.declare({
+ object: 'uci',
+ method: 'order',
+ params: [ 'config', 'sections' ]
+ }),
- iface.subdevices = [ ];
- for (var j = 0; j < subdevs.length; j++)
- {
- iface.subdevices[j] = { 'name': subdevs[j] };
- requests.push(['network.device', 'status', { 'name': subdevs[j] }, iface.subdevices[j]]);
- }
- }
+ _add: L.rpc.declare({
+ object: 'uci',
+ method: 'add',
+ params: [ 'config', 'type', 'name', 'values' ],
+ expect: { section: '' }
+ }),
- return _luci2.rpc.call(requests, function(responses) {
- for (var key in responses)
- if (responses[key][0] == 0 && responses[key][1] && responses[key][2])
- $.extend(responses[key][2], responses[key][1]);
- });
- }).then(function() {
- var requests = [ ];
+ _set: L.rpc.declare({
+ object: 'uci',
+ method: 'set',
+ params: [ 'config', 'section', 'values' ]
+ }),
- for (var i = 0; i < ifaces.length; i++)
- {
- var iface = ifaces[i];
+ _delete: L.rpc.declare({
+ object: 'uci',
+ method: 'delete',
+ params: [ 'config', 'section', 'options' ]
+ }),
- if (iface.device)
- requests.push(['iwinfo', 'info', { 'device': iface.device.name }, iface.device]);
+ _newid: function(conf)
+ {
+ var v = this.state.values;
+ var n = this.state.creates;
+ var sid;
- if (iface.subdevices)
- for (var j = 0; j < iface.subdevices.length; j++)
- requests.push(['iwinfo', 'info', { 'device': iface.subdevices[j].name }, iface.subdevices[j]]);
- }
+ do {
+ sid = "new%06x".format(Math.random() * 0xFFFFFF);
+ } while ((n[conf] && n[conf][sid]) || (v[conf] && v[conf][sid]));
- return _luci2.rpc.call(requests, function(responses) {
- for (var key in responses)
- if (responses[key][0] == 0 && responses[key][1] && responses[key][2])
- if (!$.isEmptyObject(responses[key][1]))
- responses[key][2].wireless = responses[key][1];
- });
- }).then(function() {
- ifaces.sort(function(a, b) {
- if (a['interface'] < b['interface'])
- return -1;
- else if (a['interface'] > b['interface'])
- return 1;
- else
- return 0;
- });
- return retcb(cb, ifaces);
- });
+ return sid;
},
- findWanInterfaces: function(cb)
+ load: function(packages)
{
- return _luci2.rpc.list().then(function(data) {
- var requests = { };
- for (var i = 0; i < data.length; i++)
- {
- if (data[i].indexOf('network.interface.') == 0)
- {
- var ifname = data[i].substring(18);
- requests[ifname] = ['network.interface', 'status', { 'interface': ifname }];
- }
- }
- return _luci2.rpc.call(requests);
- }).then(function(responses) {
- var rv = [ ];
- for (var ifname in responses)
- {
- var response = responses[ifname];
+ var self = this;
+ var seen = { };
+ var pkgs = [ ];
- if (response[0] != 0 || !response[1] || !response[1].route)
- continue;
+ if (!$.isArray(packages))
+ packages = [ packages ];
- for (var rn = 0, rt = response[1].route[rn];
- rn < response[1].route.length;
- rn++, rt = response[1].route[rn])
- {
- if (typeof(rt.table) != 'undefined')
- continue;
+ L.rpc.batch();
- if (rt.target == '0.0.0.0' && rt.mask == 0)
- rv[0] = response[1];
- else if (rt.target == '::' && rt.mask == 0)
- rv[1] = response[1];
- }
+ for (var i = 0; i < packages.length; i++)
+ if (!seen[packages[i]] && !self.state.values[packages[i]])
+ {
+ pkgs.push(packages[i]);
+ seen[packages[i]] = true;
+ self._load(packages[i]);
}
- return retcb(cb, rv);
- });
- },
+ return L.rpc.flush().then(function(responses) {
+ for (var i = 0; i < responses.length; i++)
+ self.state.values[pkgs[i]] = responses[i];
- getDHCPLeases: function(cb)
- {
- return rcall('luci2.network', 'dhcp_leases', undefined, 'leases', [ ], cb);
+ return pkgs;
+ });
},
- getDHCPv6Leases: function(cb)
+ unload: function(packages)
{
- return rcall('luci2.network', 'dhcp6_leases', undefined, 'leases', [ ], cb);
- },
+ if (!$.isArray(packages))
+ packages = [ packages ];
- getRoutes: function(cb)
- {
- return rcall('luci2.network', 'routes', undefined, 'routes', [ ], cb);
+ for (var i = 0; i < packages.length; i++)
+ {
+ delete this.state.values[packages[i]];
+ delete this.state.creates[packages[i]];
+ delete this.state.changes[packages[i]];
+ delete this.state.deletes[packages[i]];
+ }
},
- getIPv6Routes: function(cb)
+ add: function(conf, type, name)
{
- return rcall('luci2.network', 'routes6', undefined, 'routes', [ ], cb);
- },
+ var n = this.state.creates;
+ var sid = this._newid(conf);
- getARPTable: function(cb)
- {
- return rcall('luci2.network', 'arp_table', undefined, 'entries', [ ], cb);
- },
+ if (!n[conf])
+ n[conf] = { };
- getInterfaceStatus: function(iface, cb)
- {
- return rcall('network.interface', 'status', { 'interface': iface }, undefined, { }, cb, function(rv) {
- rv['interface'] = iface;
- rv['l2_device'] = rv['device'];
- return rv;
- });
- },
+ n[conf][sid] = {
+ '.type': type,
+ '.name': sid,
+ '.create': name,
+ '.anonymous': !name,
+ '.index': 1000 + this.state.newidx++
+ };
- getDeviceStatus: function(dev, cb)
- {
- return rcall('network.device', 'status', { name: dev }, undefined, { }, cb, function(rv) {
- if (typeof(dev) == 'string')
- rv.device = dev;
- return rv;
- });
+ return sid;
},
- getConntrackCount: function(cb)
+ remove: function(conf, sid)
{
- return rcall('luci2.network', 'conntrack_count', undefined, undefined, {
- count: 0,
- limit: 0
- }, cb);
- }
- };
+ var n = this.state.creates;
+ var c = this.state.changes;
+ var d = this.state.deletes;
- this.wireless = {
- getDevices: function(cb) {
- return rcall('iwinfo', 'devices', undefined, 'devices', [ ], cb, function(rv) {
- rv.sort();
- return rv;
+ /* requested deletion of a just created section */
+ if (n[conf] && n[conf][sid])
+ {
+ delete n[conf][sid];
+ }
+ else
+ {
+ if (c[conf])
+ delete c[conf][sid];
+
+ if (!d[conf])
+ d[conf] = { };
+
+ d[conf][sid] = true;
+ }
+ },
+
+ sections: function(conf, type, cb)
+ {
+ var sa = [ ];
+ var v = this.state.values[conf];
+ var n = this.state.creates[conf];
+ var c = this.state.changes[conf];
+ var d = this.state.deletes[conf];
+
+ if (!v)
+ return sa;
+
+ for (var s in v)
+ if (!d || d[s] !== true)
+ if (!type || v[s]['.type'] == type)
+ sa.push($.extend({ }, v[s], c ? c[s] : undefined));
+
+ if (n)
+ for (var s in n)
+ if (!type || n[s]['.type'] == type)
+ sa.push(n[s]);
+
+ sa.sort(function(a, b) {
+ return a['.index'] - b['.index'];
});
+
+ for (var i = 0; i < sa.length; i++)
+ sa[i]['.index'] = i;
+
+ if (typeof(cb) == 'function')
+ for (var i = 0; i < sa.length; i++)
+ cb.call(this, sa[i], sa[i]['.name']);
+
+ return sa;
},
- getInfo: function(dev, cb) {
- var parse_info = function(device, info, rv)
+ get: function(conf, sid, opt)
+ {
+ var v = this.state.values;
+ var n = this.state.creates;
+ var c = this.state.changes;
+ var d = this.state.deletes;
+
+ if (typeof(sid) == 'undefined')
+ return undefined;
+
+ /* requested option in a just created section */
+ if (n[conf] && n[conf][sid])
{
- if (!rv[info.phy])
- rv[info.phy] = {
- networks: [ ]
- };
+ if (!n[conf])
+ return undefined;
- var phy = rv[info.phy];
+ if (typeof(opt) == 'undefined')
+ return n[conf][sid];
- var phy_attrs = [
- 'country', 'channel', 'frequency', 'frequency_offset',
- 'txpower', 'txpower_offset', 'hwmodes', 'hardware', 'phy'
- ];
+ return n[conf][sid][opt];
+ }
- var net_attrs = [
- 'ssid', 'bssid', 'mode', 'quality', 'quality_max',
- 'signal', 'noise', 'bitrate', 'encryption'
- ];
+ /* requested an option value */
+ if (typeof(opt) != 'undefined')
+ {
+ /* check whether option was deleted */
+ if (d[conf] && d[conf][sid])
+ {
+ if (d[conf][sid] === true)
+ return undefined;
- for (var i = 0; i < phy_attrs.length; i++)
- phy[phy_attrs[i]] = info[phy_attrs[i]];
+ for (var i = 0; i < d[conf][sid].length; i++)
+ if (d[conf][sid][i] == opt)
+ return undefined;
+ }
- var net = {
- device: device
- };
+ /* check whether option was changed */
+ if (c[conf] && c[conf][sid] && typeof(c[conf][sid][opt]) != 'undefined')
+ return c[conf][sid][opt];
- for (var i = 0; i < net_attrs.length; i++)
- net[net_attrs[i]] = info[net_attrs[i]];
+ /* return base value */
+ if (v[conf] && v[conf][sid])
+ return v[conf][sid][opt];
- phy.networks.push(net);
+ return undefined;
+ }
- return phy;
- };
+ /* requested an entire section */
+ if (v[conf])
+ return v[conf][sid];
+
+ return undefined;
+ },
+
+ set: function(conf, sid, opt, val)
+ {
+ var v = this.state.values;
+ var n = this.state.creates;
+ var c = this.state.changes;
+ var d = this.state.deletes;
- if (!dev)
+ if (typeof(sid) == 'undefined' ||
+ typeof(opt) == 'undefined' ||
+ opt.charAt(0) == '.')
+ return;
+
+ if (n[conf] && n[conf][sid])
+ {
+ if (typeof(val) != 'undefined')
+ n[conf][sid][opt] = val;
+ else
+ delete n[conf][sid][opt];
+ }
+ else if (typeof(val) != 'undefined')
{
- return _luci2.wireless.getDevices().then(function(devices) {
- var requests = [ ];
+ /* do not set within deleted section */
+ if (d[conf] && d[conf][sid] === true)
+ return;
- for (var i = 0; i < devices.length; i++)
- {
- if (devices[i].indexOf('.sta') >= 0)
- continue;
+ /* only set in existing sections */
+ if (!v[conf] || !v[conf][sid])
+ return;
- requests[devices[i]] = [ 'iwinfo', 'info', { device: devices[i] } ];
- }
+ if (!c[conf])
+ c[conf] = { };
- return _luci2.rpc.call(requests);
- }).then(function(responses) {
- var rv = { };
+ if (!c[conf][sid])
+ c[conf][sid] = { };
- for (var device in responses)
- {
- var response = responses[device];
+ /* undelete option */
+ if (d[conf] && d[conf][sid])
+ d[conf][sid] = L.filterArray(d[conf][sid], opt);
- if (response[0] != 0 || !response[1])
- continue;
+ c[conf][sid][opt] = val;
+ }
+ else
+ {
+ /* only delete in existing sections */
+ if (!v[conf] || !v[conf][sid])
+ return;
- parse_info(device, response[1], rv);
- }
+ if (!d[conf])
+ d[conf] = { };
- return retcb(cb, rv);
- });
+ if (!d[conf][sid])
+ d[conf][sid] = [ ];
+
+ if (d[conf][sid] !== true)
+ d[conf][sid].push(opt);
}
+ },
+
+ unset: function(conf, sid, opt)
+ {
+ return this.set(conf, sid, opt, undefined);
+ },
+
+ get_first: function(conf, type, opt)
+ {
+ var sid = undefined;
+
+ L.uci.sections(conf, type, function(s) {
+ if (typeof(sid) != 'string')
+ sid = s['.name'];
+ });
+
+ return this.get(conf, sid, opt);
+ },
- return _luci2.rpc.call('iwinfo', 'info', { device: dev }).then(function(response) {
- if (response[0] != 0 || !response[1])
- return retcb(cb, { });
+ set_first: function(conf, type, opt, val)
+ {
+ var sid = undefined;
- return retcb(cb, parse_info(dev, response[1], { }));
+ L.uci.sections(conf, type, function(s) {
+ if (typeof(sid) != 'string')
+ sid = s['.name'];
});
+
+ return this.set(conf, sid, opt, val);
+ },
+
+ unset_first: function(conf, type, opt)
+ {
+ return this.set_first(conf, type, opt, undefined);
+ },
+
+ _reload: function()
+ {
+ var pkgs = [ ];
+
+ for (var pkg in this.state.values)
+ pkgs.push(pkg);
+
+ this.init();
+
+ return this.load(pkgs);
},
- getAssocList: function(dev, cb)
+ _reorder: function()
{
- if (!dev)
+ var v = this.state.values;
+ var n = this.state.creates;
+ var r = this.state.reorder;
+
+ if ($.isEmptyObject(r))
+ return L.deferrable();
+
+ L.rpc.batch();
+
+ /*
+ gather all created and existing sections, sort them according
+ to their index value and issue an uci order call
+ */
+ for (var c in r)
{
- return _luci2.wireless.getDevices().then(function(devices) {
- var requests = { };
+ var o = [ ];
+
+ if (n[c])
+ for (var s in n[c])
+ o.push(n[c][s]);
+
+ for (var s in v[c])
+ o.push(v[c][s]);
+
+ if (o.length > 0)
+ {
+ o.sort(function(a, b) {
+ return (a['.index'] - b['.index']);
+ });
+
+ var sids = [ ];
+
+ for (var i = 0; i < o.length; i++)
+ sids.push(o[i]['.name']);
+
+ this._order(c, sids);
+ }
+ }
+
+ this.state.reorder = { };
+ return L.rpc.flush();
+ },
+
+ swap: function(conf, sid1, sid2)
+ {
+ var s1 = this.get(conf, sid1);
+ var s2 = this.get(conf, sid2);
+ var n1 = s1 ? s1['.index'] : NaN;
+ var n2 = s2 ? s2['.index'] : NaN;
+
+ if (isNaN(n1) || isNaN(n2))
+ return false;
+
+ s1['.index'] = n2;
+ s2['.index'] = n1;
+
+ this.state.reorder[conf] = true;
+
+ return true;
+ },
- for (var i = 0; i < devices.length; i++)
+ save: function()
+ {
+ L.rpc.batch();
+
+ var v = this.state.values;
+ var n = this.state.creates;
+ var c = this.state.changes;
+ var d = this.state.deletes;
+
+ var self = this;
+ var snew = [ ];
+ var pkgs = { };
+
+ if (n)
+ for (var conf in n)
+ {
+ for (var sid in n[conf])
{
- if (devices[i].indexOf('.sta') >= 0)
- continue;
+ var r = {
+ config: conf,
+ values: { }
+ };
+
+ for (var k in n[conf][sid])
+ {
+ if (k == '.type')
+ r.type = n[conf][sid][k];
+ else if (k == '.create')
+ r.name = n[conf][sid][k];
+ else if (k.charAt(0) != '.')
+ r.values[k] = n[conf][sid][k];
+ }
- requests[devices[i]] = [ 'iwinfo', 'assoclist', { device: devices[i] } ];
+ snew.push(n[conf][sid]);
+
+ self._add(r.config, r.type, r.name, r.values);
}
- return _luci2.rpc.call(requests);
- }).then(function(responses) {
- var rv = [ ];
+ pkgs[conf] = true;
+ }
+
+ if (c)
+ for (var conf in c)
+ {
+ for (var sid in c[conf])
+ self._set(conf, sid, c[conf][sid]);
+
+ pkgs[conf] = true;
+ }
- for (var device in responses)
+ if (d)
+ for (var conf in d)
+ {
+ for (var sid in d[conf])
{
- var response = responses[device];
+ var o = d[conf][sid];
+ self._delete(conf, sid, (o === true) ? undefined : o);
+ }
- if (response[0] != 0 || !response[1] || !response[1].results)
- continue;
+ pkgs[conf] = true;
+ }
+
+ return L.rpc.flush().then(function(responses) {
+ /*
+ array "snew" holds references to the created uci sections,
+ use it to assign the returned names of the new sections
+ */
+ for (var i = 0; i < snew.length; i++)
+ snew[i]['.name'] = responses[i];
+
+ return self._reorder();
+ }).then(function() {
+ pkgs = L.toArray(pkgs);
+
+ self.unload(pkgs);
+
+ return self.load(pkgs);
+ });
+ },
+
+ _apply: L.rpc.declare({
+ object: 'uci',
+ method: 'apply',
+ params: [ 'timeout', 'rollback' ]
+ }),
+
+ _confirm: L.rpc.declare({
+ object: 'uci',
+ method: 'confirm'
+ }),
+
+ apply: function(timeout)
+ {
+ var self = this;
+ var date = new Date();
+ var deferred = $.Deferred();
+
+ if (typeof(timeout) != 'number' || timeout < 1)
+ timeout = 10;
+
+ self._apply(timeout, true).then(function(rv) {
+ if (rv != 0)
+ {
+ deferred.rejectWith(self, [ rv ]);
+ return;
+ }
- for (var i = 0; i < response[1].results.length; i++)
+ var try_deadline = date.getTime() + 1000 * timeout;
+ var try_confirm = function()
+ {
+ return self._confirm().then(function(rv) {
+ if (rv != 0)
{
- var station = response[1].results[i];
+ if (date.getTime() < try_deadline)
+ window.setTimeout(try_confirm, 250);
+ else
+ deferred.rejectWith(self, [ rv ]);
- station.device = device;
- rv.push(station);
+ return;
}
- }
- rv.sort(function(a, b) {
- return (a.device == b.device)
- ? (a.bssid < b.bssid)
- : (a.device > b.device)
- ;
+ deferred.resolveWith(self, [ rv ]);
});
+ };
+
+ window.setTimeout(try_confirm, 1000);
+ });
+
+ return deferred;
+ },
+
+ changes: L.rpc.declare({
+ object: 'uci',
+ method: 'changes',
+ expect: { changes: { } }
+ }),
+
+ readable: function(conf)
+ {
+ return L.session.hasACL('uci', conf, 'read');
+ },
+
+ writable: function(conf)
+ {
+ return L.session.hasACL('uci', conf, 'write');
+ }
+ });
+
+ this.uci = new this.UCIContext();
+
+ this.wireless = {
+ listDeviceNames: L.rpc.declare({
+ object: 'iwinfo',
+ method: 'devices',
+ expect: { 'devices': [ ] },
+ filter: function(data) {
+ data.sort();
+ return data;
+ }
+ }),
+
+ getDeviceStatus: L.rpc.declare({
+ object: 'iwinfo',
+ method: 'info',
+ params: [ 'device' ],
+ expect: { '': { } },
+ filter: function(data, params) {
+ if (!$.isEmptyObject(data))
+ {
+ data['device'] = params['device'];
+ return data;
+ }
+ return undefined;
+ }
+ }),
+
+ getAssocList: L.rpc.declare({
+ object: 'iwinfo',
+ method: 'assoclist',
+ params: [ 'device' ],
+ expect: { results: [ ] },
+ filter: function(data, params) {
+ for (var i = 0; i < data.length; i++)
+ data[i]['device'] = params['device'];
- return retcb(cb, rv);
+ data.sort(function(a, b) {
+ if (a.bssid < b.bssid)
+ return -1;
+ else if (a.bssid > b.bssid)
+ return 1;
+ else
+ return 0;
});
+
+ return data;
}
+ }),
- return _luci2.rpc.call('iwinfo', 'assoclist', { device: dev }).then(function(response) {
- var rv = [ ];
+ getWirelessStatus: function() {
+ return this.listDeviceNames().then(function(names) {
+ L.rpc.batch();
+
+ for (var i = 0; i < names.length; i++)
+ L.wireless.getDeviceStatus(names[i]);
+
+ return L.rpc.flush();
+ }).then(function(networks) {
+ var rv = { };
+
+ var phy_attrs = [
+ 'country', 'channel', 'frequency', 'frequency_offset',
+ 'txpower', 'txpower_offset', 'hwmodes', 'hardware', 'phy'
+ ];
- if (response[0] != 0 || !response[1] || !response[1].results)
- return retcb(cb, rv);
+ var net_attrs = [
+ 'ssid', 'bssid', 'mode', 'quality', 'quality_max',
+ 'signal', 'noise', 'bitrate', 'encryption'
+ ];
- for (var i = 0; i < response[1].results.length; i++)
+ for (var i = 0; i < networks.length; i++)
{
- var station = response[1].results[i];
+ var phy = rv[networks[i].phy] || (
+ rv[networks[i].phy] = { networks: [ ] }
+ );
+
+ var net = {
+ device: networks[i].device
+ };
+
+ for (var j = 0; j < phy_attrs.length; j++)
+ phy[phy_attrs[j]] = networks[i][phy_attrs[j]];
- station.device = dev;
- rv.push(station);
+ for (var j = 0; j < net_attrs.length; j++)
+ net[net_attrs[j]] = networks[i][net_attrs[j]];
+
+ phy.networks.push(net);
}
- rv.sort(function(a, b) {
- return (a.bssid < b.bssid);
- });
+ return rv;
+ });
+ },
+
+ getAssocLists: function()
+ {
+ return this.listDeviceNames().then(function(names) {
+ L.rpc.batch();
+
+ for (var i = 0; i < names.length; i++)
+ L.wireless.getAssocList(names[i]);
- return retcb(cb, rv);
+ return L.rpc.flush();
+ }).then(function(assoclists) {
+ var rv = [ ];
+
+ for (var i = 0; i < assoclists.length; i++)
+ for (var j = 0; j < assoclists[i].length; j++)
+ rv.push(assoclists[i][j]);
+
+ return rv;
});
},
@@ -1040,21 +1486,21 @@ function LuCI2()
}
if (!enc || !enc.enabled)
- return _luci2.tr('None');
+ return L.tr('None');
if (enc.wep)
{
if (enc.wep.length == 2)
- return _luci2.tr('WEP Open/Shared') + ' (%s)'.format(format_list(enc.ciphers, ', '));
+ return L.tr('WEP Open/Shared') + ' (%s)'.format(format_list(enc.ciphers, ', '));
else if (enc.wep[0] == 'shared')
- return _luci2.tr('WEP Shared Auth') + ' (%s)'.format(format_list(enc.ciphers, ', '));
+ return L.tr('WEP Shared Auth') + ' (%s)'.format(format_list(enc.ciphers, ', '));
else
- return _luci2.tr('WEP Open System') + ' (%s)'.format(format_list(enc.ciphers, ', '));
+ return L.tr('WEP Open System') + ' (%s)'.format(format_list(enc.ciphers, ', '));
}
else if (enc.wpa)
{
if (enc.wpa.length == 2)
- return _luci2.tr('mixed WPA/WPA2') + ' %s (%s)'.format(
+ return L.tr('mixed WPA/WPA2') + ' %s (%s)'.format(
format_list(enc.authentication, '/'),
format_list(enc.ciphers, ', ')
);
@@ -1070,479 +1516,1788 @@ function LuCI2()
);
}
- return _luci2.tr('Unknown');
+ return L.tr('Unknown');
}
};
- this.system = {
- getInfo: function(cb)
+ this.firewall = {
+ getZoneColor: function(zone)
{
- return _luci2.rpc.call({
- info: [ 'system', 'info', { } ],
- board: [ 'system', 'board', { } ],
- disk: [ 'luci2.system', 'diskfree', { } ]
- }).then(function(responses) {
- var rv = { };
+ if ($.isPlainObject(zone))
+ zone = zone.name;
- if (responses.info[0] == 0)
- $.extend(rv, responses.info[1]);
+ if (zone == 'lan')
+ return '#90f090';
+ else if (zone == 'wan')
+ return '#f09090';
- if (responses.board[0] == 0)
- $.extend(rv, responses.board[1]);
+ for (var i = 0, hash = 0;
+ i < zone.length;
+ hash = zone.charCodeAt(i++) + ((hash << 5) - hash));
- if (responses.disk[0] == 0)
- $.extend(rv, responses.disk[1]);
+ for (var i = 0, color = '#';
+ i < 3;
+ color += ('00' + ((hash >> i++ * 8) & 0xFF).tostring(16)).slice(-2));
- return retcb(cb, rv);
- });
+ return color;
+ },
+
+ findZoneByNetwork: function(network)
+ {
+ var self = this;
+ var zone = undefined;
+
+ return L.uci.sections('firewall', 'zone', function(z) {
+ if (!z.name || !z.network)
+ return;
+
+ if (!$.isArray(z.network))
+ z.network = z.network.split(/\s+/);
+
+ for (var i = 0; i < z.network.length; i++)
+ {
+ if (z.network[i] == network)
+ {
+ zone = z;
+ break;
+ }
+ }
+ }).then(function() {
+ if (zone)
+ zone.color = self.getZoneColor(zone);
+
+ return zone;
+ });
+ }
+ };
+
+ this.NetworkModel = {
+ _device_blacklist: [
+ /^gre[0-9]+$/,
+ /^gretap[0-9]+$/,
+ /^ifb[0-9]+$/,
+ /^ip6tnl[0-9]+$/,
+ /^sit[0-9]+$/,
+ /^wlan[0-9]+\.sta[0-9]+$/
+ ],
+
+ _cache_functions: [
+ 'protolist', 0, L.rpc.declare({
+ object: 'network',
+ method: 'get_proto_handlers',
+ expect: { '': { } }
+ }),
+ 'ifstate', 1, L.rpc.declare({
+ object: 'network.interface',
+ method: 'dump',
+ expect: { 'interface': [ ] }
+ }),
+ 'devstate', 2, L.rpc.declare({
+ object: 'network.device',
+ method: 'status',
+ expect: { '': { } }
+ }),
+ 'wifistate', 0, L.rpc.declare({
+ object: 'network.wireless',
+ method: 'status',
+ expect: { '': { } }
+ }),
+ 'bwstate', 2, L.rpc.declare({
+ object: 'luci2.network.bwmon',
+ method: 'statistics',
+ expect: { 'statistics': { } }
+ }),
+ 'devlist', 2, L.rpc.declare({
+ object: 'luci2.network',
+ method: 'device_list',
+ expect: { 'devices': [ ] }
+ }),
+ 'swlist', 0, L.rpc.declare({
+ object: 'luci2.network',
+ method: 'switch_list',
+ expect: { 'switches': [ ] }
+ })
+ ],
+
+ _fetch_protocol: function(proto)
+ {
+ var url = L.globals.resource + '/proto/' + proto + '.js';
+ var self = L.NetworkModel;
+
+ var def = $.Deferred();
+
+ $.ajax(url, {
+ method: 'GET',
+ cache: true,
+ dataType: 'text'
+ }).then(function(data) {
+ try {
+ var protoConstructorSource = (
+ '(function(L, $) { ' +
+ 'return %s' +
+ '})(L, $);\n\n' +
+ '//@ sourceURL=%s'
+ ).format(data, url);
+
+ var protoClass = eval(protoConstructorSource);
+
+ self._protos[proto] = new protoClass();
+ }
+ catch(e) {
+ alert('Unable to instantiate proto "%s": %s'.format(url, e));
+ };
+
+ def.resolve();
+ }).fail(function() {
+ def.resolve();
+ });
+
+ return def;
+ },
+
+ _fetch_protocols: function()
+ {
+ var self = L.NetworkModel;
+ var deferreds = [
+ self._fetch_protocol('none')
+ ];
+
+ for (var proto in self._cache.protolist)
+ deferreds.push(self._fetch_protocol(proto));
+
+ return $.when.apply($, deferreds);
+ },
+
+ _fetch_swstate: L.rpc.declare({
+ object: 'luci2.network',
+ method: 'switch_info',
+ params: [ 'switch' ],
+ expect: { 'info': { } }
+ }),
+
+ _fetch_swstate_cb: function(responses) {
+ var self = L.NetworkModel;
+ var swlist = self._cache.swlist;
+ var swstate = self._cache.swstate = { };
+
+ for (var i = 0; i < responses.length; i++)
+ swstate[swlist[i]] = responses[i];
+ },
+
+ _fetch_cache_cb: function(level)
+ {
+ var self = L.NetworkModel;
+ var name = '_fetch_cache_cb_' + level;
+
+ return self[name] || (
+ self[name] = function(responses)
+ {
+ for (var i = 0; i < self._cache_functions.length; i += 3)
+ if (!level || self._cache_functions[i + 1] == level)
+ self._cache[self._cache_functions[i]] = responses.shift();
+
+ if (!level)
+ {
+ L.rpc.batch();
+
+ for (var i = 0; i < self._cache.swlist.length; i++)
+ self._fetch_swstate(self._cache.swlist[i]);
+
+ return L.rpc.flush().then(self._fetch_swstate_cb);
+ }
+
+ return L.deferrable();
+ }
+ );
+ },
+
+ _fetch_cache: function(level)
+ {
+ var self = L.NetworkModel;
+
+ return L.uci.load(['network', 'wireless']).then(function() {
+ L.rpc.batch();
+
+ for (var i = 0; i < self._cache_functions.length; i += 3)
+ if (!level || self._cache_functions[i + 1] == level)
+ self._cache_functions[i + 2]();
+
+ return L.rpc.flush().then(self._fetch_cache_cb(level || 0));
+ });
+ },
+
+ _get: function(pkg, sid, key)
+ {
+ return L.uci.get(pkg, sid, key);
+ },
+
+ _set: function(pkg, sid, key, val)
+ {
+ return L.uci.set(pkg, sid, key, val);
+ },
+
+ _is_blacklisted: function(dev)
+ {
+ for (var i = 0; i < this._device_blacklist.length; i++)
+ if (dev.match(this._device_blacklist[i]))
+ return true;
+
+ return false;
+ },
+
+ _sort_devices: function(a, b)
+ {
+ if (a.options.kind < b.options.kind)
+ return -1;
+ else if (a.options.kind > b.options.kind)
+ return 1;
+
+ if (a.options.name < b.options.name)
+ return -1;
+ else if (a.options.name > b.options.name)
+ return 1;
+
+ return 0;
+ },
+
+ _get_dev: function(ifname)
+ {
+ var alias = (ifname.charAt(0) == '@');
+ return this._devs[ifname] || (
+ this._devs[ifname] = {
+ ifname: ifname,
+ kind: alias ? 'alias' : 'ethernet',
+ type: alias ? 0 : 1,
+ up: false,
+ changed: { }
+ }
+ );
+ },
+
+ _get_iface: function(name)
+ {
+ return this._ifaces[name] || (
+ this._ifaces[name] = {
+ name: name,
+ proto: this._protos.none,
+ changed: { }
+ }
+ );
+ },
+
+ _parse_devices: function()
+ {
+ var self = L.NetworkModel;
+ var wificount = { };
+
+ for (var ifname in self._cache.devstate)
+ {
+ if (self._is_blacklisted(ifname))
+ continue;
+
+ var dev = self._cache.devstate[ifname];
+ var entry = self._get_dev(ifname);
+
+ entry.up = dev.up;
+
+ switch (dev.type)
+ {
+ case 'IP tunnel':
+ entry.kind = 'tunnel';
+ break;
+
+ case 'Bridge':
+ entry.kind = 'bridge';
+ //entry.ports = dev['bridge-members'].sort();
+ break;
+ }
+ }
+
+ for (var i = 0; i < self._cache.devlist.length; i++)
+ {
+ var dev = self._cache.devlist[i];
+
+ if (self._is_blacklisted(dev.device))
+ continue;
+
+ var entry = self._get_dev(dev.device);
+
+ entry.up = dev.is_up;
+ entry.type = dev.type;
+
+ switch (dev.type)
+ {
+ case 1: /* Ethernet */
+ if (dev.is_bridge)
+ entry.kind = 'bridge';
+ else if (dev.is_tuntap)
+ entry.kind = 'tunnel';
+ else if (dev.is_wireless)
+ entry.kind = 'wifi';
+ break;
+
+ case 512: /* PPP */
+ case 768: /* IP-IP Tunnel */
+ case 769: /* IP6-IP6 Tunnel */
+ case 776: /* IPv6-in-IPv4 */
+ case 778: /* GRE over IP */
+ entry.kind = 'tunnel';
+ break;
+ }
+ }
+
+ var net = L.uci.sections('network');
+ for (var i = 0; i < net.length; i++)
+ {
+ var s = net[i];
+ var sid = s['.name'];
+
+ if (s['.type'] == 'device' && s.name)
+ {
+ var entry = self._get_dev(s.name);
+
+ switch (s.type)
+ {
+ case 'macvlan':
+ case 'tunnel':
+ entry.kind = 'tunnel';
+ break;
+ }
+
+ entry.sid = sid;
+ }
+ else if (s['.type'] == 'interface' && !s['.anonymous'] && s.ifname)
+ {
+ var ifnames = L.toArray(s.ifname);
+
+ for (var j = 0; j < ifnames.length; j++)
+ self._get_dev(ifnames[j]);
+
+ if (s['.name'] != 'loopback')
+ {
+ var entry = self._get_dev('@%s'.format(s['.name']));
+
+ entry.type = 0;
+ entry.kind = 'alias';
+ entry.sid = sid;
+ }
+ }
+ else if (s['.type'] == 'switch_vlan' && s.device)
+ {
+ var sw = self._cache.swstate[s.device];
+ var vid = parseInt(s.vid || s.vlan);
+ var ports = L.toArray(s.ports);
+
+ if (!sw || !ports.length || isNaN(vid))
+ continue;
+
+ var ifname = undefined;
+
+ for (var j = 0; j < ports.length; j++)
+ {
+ var port = parseInt(ports[j]);
+ var tag = (ports[j].replace(/[^tu]/g, '') == 't');
+
+ if (port == sw.cpu_port)
+ {
+ // XXX: need a way to map switch to netdev
+ if (tag)
+ ifname = 'eth0.%d'.format(vid);
+ else
+ ifname = 'eth0';
+
+ break;
+ }
+ }
+
+ if (!ifname)
+ continue;
+
+ var entry = self._get_dev(ifname);
+
+ entry.kind = 'vlan';
+ entry.sid = sid;
+ entry.vsw = sw;
+ entry.vid = vid;
+ }
+ }
+
+ var wifi = L.uci.sections('wireless');
+ for (var i = 0; i < wifi.length; i++)
+ {
+ var s = wifi[i];
+ var sid = s['.name'];
+
+ if (s['.type'] == 'wifi-iface' && s.device)
+ {
+ var r = parseInt(s.device.replace(/^[^0-9]+/, ''));
+ var n = wificount[s.device] = (wificount[s.device] || 0) + 1;
+ var id = 'radio%d.network%d'.format(r, n);
+ var ifname = id;
+
+ if (self._cache.wifistate[s.device])
+ {
+ var ifcs = self._cache.wifistate[s.device].interfaces;
+ for (var ifc in ifcs)
+ {
+ if (ifcs[ifc].section == sid)
+ {
+ ifname = ifcs[ifc].ifname;
+ break;
+ }
+ }
+ }
+
+ var entry = self._get_dev(ifname);
+
+ entry.kind = 'wifi';
+ entry.sid = sid;
+ entry.wid = id;
+ entry.wdev = s.device;
+ entry.wmode = s.mode;
+ entry.wssid = s.ssid;
+ entry.wbssid = s.bssid;
+ }
+ }
+
+ for (var i = 0; i < net.length; i++)
+ {
+ var s = net[i];
+ var sid = s['.name'];
+
+ if (s['.type'] == 'interface' && !s['.anonymous'] && s.type == 'bridge')
+ {
+ var ifnames = L.toArray(s.ifname);
+
+ for (var ifname in self._devs)
+ {
+ var dev = self._devs[ifname];
+
+ if (dev.kind != 'wifi')
+ continue;
+
+ var wnets = L.toArray(L.uci.get('wireless', dev.sid, 'network'));
+ if ($.inArray(sid, wnets) > -1)
+ ifnames.push(ifname);
+ }
+
+ entry = self._get_dev('br-%s'.format(s['.name']));
+ entry.type = 1;
+ entry.kind = 'bridge';
+ entry.sid = sid;
+ entry.ports = ifnames.sort();
+ }
+ }
+ },
+
+ _parse_interfaces: function()
+ {
+ var self = L.NetworkModel;
+ var net = L.uci.sections('network');
+
+ for (var i = 0; i < net.length; i++)
+ {
+ var s = net[i];
+ var sid = s['.name'];
+
+ if (s['.type'] == 'interface' && !s['.anonymous'] && s.proto)
+ {
+ var entry = self._get_iface(s['.name']);
+ var proto = self._protos[s.proto] || self._protos.none;
+
+ var l3dev = undefined;
+ var l2dev = undefined;
+
+ var ifnames = L.toArray(s.ifname);
+
+ for (var ifname in self._devs)
+ {
+ var dev = self._devs[ifname];
+
+ if (dev.kind != 'wifi')
+ continue;
+
+ var wnets = L.toArray(L.uci.get('wireless', dev.sid, 'network'));
+ if ($.inArray(entry.name, wnets) > -1)
+ ifnames.push(ifname);
+ }
+
+ if (proto.virtual)
+ l3dev = '%s-%s'.format(s.proto, entry.name);
+ else if (s.type == 'bridge')
+ l3dev = 'br-%s'.format(entry.name);
+ else
+ l3dev = ifnames[0];
+
+ if (!proto.virtual && s.type == 'bridge')
+ l2dev = 'br-%s'.format(entry.name);
+ else if (!proto.virtual)
+ l2dev = ifnames[0];
+
+ entry.proto = proto;
+ entry.sid = sid;
+ entry.l3dev = l3dev;
+ entry.l2dev = l2dev;
+ }
+ }
+
+ for (var i = 0; i < self._cache.ifstate.length; i++)
+ {
+ var iface = self._cache.ifstate[i];
+ var entry = self._get_iface(iface['interface']);
+ var proto = self._protos[iface.proto] || self._protos.none;
+
+ /* this is a virtual interface, either deleted from config but
+ not applied yet or set up from external tools (6rd) */
+ if (!entry.sid)
+ {
+ entry.proto = proto;
+ entry.l2dev = iface.device;
+ entry.l3dev = iface.l3_device;
+ }
+ }
+ },
+
+ init: function()
+ {
+ var self = this;
+
+ if (self._cache)
+ return L.deferrable();
+
+ self._cache = { };
+ self._devs = { };
+ self._ifaces = { };
+ self._protos = { };
+
+ return self._fetch_cache()
+ .then(self._fetch_protocols)
+ .then(self._parse_devices)
+ .then(self._parse_interfaces);
+ },
+
+ update: function()
+ {
+ delete this._cache;
+ return this.init();
+ },
+
+ refreshInterfaceStatus: function()
+ {
+ return this._fetch_cache(1).then(this._parse_interfaces);
+ },
+
+ refreshDeviceStatus: function()
+ {
+ return this._fetch_cache(2).then(this._parse_devices);
+ },
+
+ refreshStatus: function()
+ {
+ return this._fetch_cache(1)
+ .then(this._fetch_cache(2))
+ .then(this._parse_devices)
+ .then(this._parse_interfaces);
+ },
+
+ getDevices: function()
+ {
+ var devs = [ ];
+
+ for (var ifname in this._devs)
+ if (ifname != 'lo')
+ devs.push(new L.NetworkModel.Device(this._devs[ifname]));
+
+ return devs.sort(this._sort_devices);
+ },
+
+ getDeviceByInterface: function(iface)
+ {
+ if (iface instanceof L.NetworkModel.Interface)
+ iface = iface.name();
+
+ if (this._ifaces[iface])
+ return this.getDevice(this._ifaces[iface].l3dev) ||
+ this.getDevice(this._ifaces[iface].l2dev);
+
+ return undefined;
+ },
+
+ getDevice: function(ifname)
+ {
+ if (this._devs[ifname])
+ return new L.NetworkModel.Device(this._devs[ifname]);
+
+ return undefined;
+ },
+
+ createDevice: function(name)
+ {
+ return new L.NetworkModel.Device(this._get_dev(name));
+ },
+
+ getInterfaces: function()
+ {
+ var ifaces = [ ];
+
+ for (var name in this._ifaces)
+ if (name != 'loopback')
+ ifaces.push(this.getInterface(name));
+
+ ifaces.sort(function(a, b) {
+ if (a.name() < b.name())
+ return -1;
+ else if (a.name() > b.name())
+ return 1;
+ else
+ return 0;
+ });
+
+ return ifaces;
+ },
+
+ getInterfacesByDevice: function(dev)
+ {
+ var ifaces = [ ];
+
+ if (dev instanceof L.NetworkModel.Device)
+ dev = dev.name();
+
+ for (var name in this._ifaces)
+ {
+ var iface = this._ifaces[name];
+ if (iface.l2dev == dev || iface.l3dev == dev)
+ ifaces.push(this.getInterface(name));
+ }
+
+ ifaces.sort(function(a, b) {
+ if (a.name() < b.name())
+ return -1;
+ else if (a.name() > b.name())
+ return 1;
+ else
+ return 0;
+ });
+
+ return ifaces;
+ },
+
+ getInterface: function(iface)
+ {
+ if (this._ifaces[iface])
+ return new L.NetworkModel.Interface(this._ifaces[iface]);
+
+ return undefined;
+ },
+
+ getProtocols: function()
+ {
+ var rv = [ ];
+
+ for (var proto in this._protos)
+ {
+ var pr = this._protos[proto];
+
+ rv.push({
+ name: proto,
+ description: pr.description,
+ virtual: pr.virtual,
+ tunnel: pr.tunnel
+ });
+ }
+
+ return rv.sort(function(a, b) {
+ if (a.name < b.name)
+ return -1;
+ else if (a.name > b.name)
+ return 1;
+ else
+ return 0;
+ });
+ },
+
+ _find_wan: function(ipaddr)
+ {
+ for (var i = 0; i < this._cache.ifstate.length; i++)
+ {
+ var ifstate = this._cache.ifstate[i];
+
+ if (!ifstate.route)
+ continue;
+
+ for (var j = 0; j < ifstate.route.length; j++)
+ if (ifstate.route[j].mask == 0 &&
+ ifstate.route[j].target == ipaddr &&
+ typeof(ifstate.route[j].table) == 'undefined')
+ {
+ return this.getInterface(ifstate['interface']);
+ }
+ }
+
+ return undefined;
+ },
+
+ findWAN: function()
+ {
+ return this._find_wan('0.0.0.0');
+ },
+
+ findWAN6: function()
+ {
+ return this._find_wan('::');
+ },
+
+ resolveAlias: function(ifname)
+ {
+ if (ifname instanceof L.NetworkModel.Device)
+ ifname = ifname.name();
+
+ var dev = this._devs[ifname];
+ var seen = { };
+
+ while (dev && dev.kind == 'alias')
+ {
+ // loop
+ if (seen[dev.ifname])
+ return undefined;
+
+ var ifc = this._ifaces[dev.sid];
+
+ seen[dev.ifname] = true;
+ dev = ifc ? this._devs[ifc.l3dev] : undefined;
+ }
+
+ return dev ? this.getDevice(dev.ifname) : undefined;
+ }
+ };
+
+ this.NetworkModel.Device = Class.extend({
+ _wifi_modes: {
+ ap: L.tr('Master'),
+ sta: L.tr('Client'),
+ adhoc: L.tr('Ad-Hoc'),
+ monitor: L.tr('Monitor'),
+ wds: L.tr('Static WDS')
+ },
+
+ _status: function(key)
+ {
+ var s = L.NetworkModel._cache.devstate[this.options.ifname];
+
+ if (s)
+ return key ? s[key] : s;
+
+ return undefined;
+ },
+
+ get: function(key)
+ {
+ var sid = this.options.sid;
+ var pkg = (this.options.kind == 'wifi') ? 'wireless' : 'network';
+ return L.NetworkModel._get(pkg, sid, key);
+ },
+
+ set: function(key, val)
+ {
+ var sid = this.options.sid;
+ var pkg = (this.options.kind == 'wifi') ? 'wireless' : 'network';
+ return L.NetworkModel._set(pkg, sid, key, val);
+ },
+
+ init: function()
+ {
+ if (typeof(this.options.type) == 'undefined')
+ this.options.type = 1;
+
+ if (typeof(this.options.kind) == 'undefined')
+ this.options.kind = 'ethernet';
+
+ if (typeof(this.options.networks) == 'undefined')
+ this.options.networks = [ ];
+ },
+
+ name: function()
+ {
+ return this.options.ifname;
+ },
+
+ description: function()
+ {
+ switch (this.options.kind)
+ {
+ case 'alias':
+ return L.tr('Alias for network "%s"').format(this.options.ifname.substring(1));
+
+ case 'bridge':
+ return L.tr('Network bridge');
+
+ case 'ethernet':
+ return L.tr('Network device');
+
+ case 'tunnel':
+ switch (this.options.type)
+ {
+ case 1: /* tuntap */
+ return L.tr('TAP device');
+
+ case 512: /* PPP */
+ return L.tr('PPP tunnel');
+
+ case 768: /* IP-IP Tunnel */
+ return L.tr('IP-in-IP tunnel');
+
+ case 769: /* IP6-IP6 Tunnel */
+ return L.tr('IPv6-in-IPv6 tunnel');
+
+ case 776: /* IPv6-in-IPv4 */
+ return L.tr('IPv6-over-IPv4 tunnel');
+ break;
+
+ case 778: /* GRE over IP */
+ return L.tr('GRE-over-IP tunnel');
+
+ default:
+ return L.tr('Tunnel device');
+ }
+
+ case 'vlan':
+ return L.tr('VLAN %d on %s').format(this.options.vid, this.options.vsw.model);
+
+ case 'wifi':
+ var o = this.options;
+ return L.trc('(Wifi-Mode) "(SSID)" on (radioX)', '%s "%h" on %s').format(
+ o.wmode ? this._wifi_modes[o.wmode] : L.tr('Unknown mode'),
+ o.wssid || '?', o.wdev
+ );
+ }
+
+ return L.tr('Unknown device');
+ },
+
+ icon: function(up)
+ {
+ var kind = this.options.kind;
+
+ if (kind == 'alias')
+ kind = 'ethernet';
+
+ if (typeof(up) == 'undefined')
+ up = this.isUp();
+
+ return L.globals.resource + '/icons/%s%s.png'.format(kind, up ? '' : '_disabled');
+ },
+
+ isUp: function()
+ {
+ var l = L.NetworkModel._cache.devlist;
+
+ for (var i = 0; i < l.length; i++)
+ if (l[i].device == this.options.ifname)
+ return (l[i].is_up === true);
+
+ return false;
+ },
+
+ isAlias: function()
+ {
+ return (this.options.kind == 'alias');
+ },
+
+ isBridge: function()
+ {
+ return (this.options.kind == 'bridge');
+ },
+
+ isBridgeable: function()
+ {
+ return (this.options.type == 1 && this.options.kind != 'bridge');
+ },
+
+ isWireless: function()
+ {
+ return (this.options.kind == 'wifi');
+ },
+
+ isInNetwork: function(net)
+ {
+ if (!(net instanceof L.NetworkModel.Interface))
+ net = L.NetworkModel.getInterface(net);
+
+ if (net)
+ {
+ if (net.options.l3dev == this.options.ifname ||
+ net.options.l2dev == this.options.ifname)
+ return true;
+
+ var dev = L.NetworkModel._devs[net.options.l2dev];
+ if (dev && dev.kind == 'bridge' && dev.ports)
+ return ($.inArray(this.options.ifname, dev.ports) > -1);
+ }
+
+ return false;
},
- getProcessList: function(cb)
+ getMTU: function()
{
- return rcall('luci2.system', 'process_list', undefined, 'processes', [ ], cb, function(rv) {
- rv.sort(function(a, b) { return a.pid - b.pid });
- return rv;
- });
+ var dev = L.NetworkModel._cache.devstate[this.options.ifname];
+ if (dev && !isNaN(dev.mtu))
+ return dev.mtu;
+
+ return undefined;
},
- getSystemLog: function(cb)
+ getMACAddress: function()
{
- return rcall('luci2.system', 'syslog', undefined, 'log', '', cb);
+ if (this.options.type != 1)
+ return undefined;
+
+ var dev = L.NetworkModel._cache.devstate[this.options.ifname];
+ if (dev && dev.macaddr)
+ return dev.macaddr.toUpperCase();
+
+ return undefined;
},
- getKernelLog: function(cb)
+ getInterfaces: function()
{
- return rcall('luci2.system', 'dmesg', undefined, 'log', '', cb);
+ return L.NetworkModel.getInterfacesByDevice(this.options.name);
},
- getZoneInfo: function(cb)
+ getStatistics: function()
{
- return $.getJSON(_luci2.globals.resource + '/zoneinfo.json', cb);
+ var s = this._status('statistics') || { };
+ return {
+ rx_bytes: (s.rx_bytes || 0),
+ tx_bytes: (s.tx_bytes || 0),
+ rx_packets: (s.rx_packets || 0),
+ tx_packets: (s.tx_packets || 0)
+ };
},
- canSendSignal: function(cb)
+ getTrafficHistory: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'process_signal', cb);
+ var def = new Array(120);
+
+ for (var i = 0; i < 120; i++)
+ def[i] = 0;
+
+ var h = L.NetworkModel._cache.bwstate[this.options.ifname] || { };
+ return {
+ rx_bytes: (h.rx_bytes || def),
+ tx_bytes: (h.tx_bytes || def),
+ rx_packets: (h.rx_packets || def),
+ tx_packets: (h.tx_packets || def)
+ };
},
- sendSignal: function(pid, sig, cb)
+ removeFromInterface: function(iface)
{
- return _luci2.rpc.call('luci2.system', 'process_signal', { pid: pid, signal: sig }).then(function(response) {
- return retcb(cb, response[0] == 0);
- });
+ if (!(iface instanceof L.NetworkModel.Interface))
+ iface = L.NetworkModel.getInterface(iface);
+
+ if (!iface)
+ return;
+
+ var ifnames = L.toArray(iface.get('ifname'));
+ if ($.inArray(this.options.ifname, ifnames) > -1)
+ iface.set('ifname', L.filterArray(ifnames, this.options.ifname));
+
+ if (this.options.kind != 'wifi')
+ return;
+
+ var networks = L.toArray(this.get('network'));
+ if ($.inArray(iface.name(), networks) > -1)
+ this.set('network', L.filterArray(networks, iface.name()));
},
- initList: function(cb)
+ attachToInterface: function(iface)
{
- return rcall('luci2.system', 'init_list', undefined, 'initscripts', [ ], cb, function(rv) {
- rv.sort(function(a, b) { return (a.start || 0) - (b.start || 0) });
- return rv;
- });
- },
+ if (!(iface instanceof L.NetworkModel.Interface))
+ iface = L.NetworkModel.getInterface(iface);
- initEnabled: function(init, cb)
+ if (!iface)
+ return;
+
+ if (this.options.kind != 'wifi')
+ {
+ var ifnames = L.toArray(iface.get('ifname'));
+ if ($.inArray(this.options.ifname, ifnames) < 0)
+ {
+ ifnames.push(this.options.ifname);
+ iface.set('ifname', (ifnames.length > 1) ? ifnames : ifnames[0]);
+ }
+ }
+ else
+ {
+ var networks = L.toArray(this.get('network'));
+ if ($.inArray(iface.name(), networks) < 0)
+ {
+ networks.push(iface.name());
+ this.set('network', (networks.length > 1) ? networks : networks[0]);
+ }
+ }
+ }
+ });
+
+ this.NetworkModel.Interface = Class.extend({
+ _status: function(key)
{
- return this.initList(function(list) {
- for (var i = 0; i < list.length; i++)
- if (list[i].name == init)
- return retcb(cb, !!list[i].enabled);
+ var s = L.NetworkModel._cache.ifstate;
- return retcb(cb, false);
- });
+ for (var i = 0; i < s.length; i++)
+ if (s[i]['interface'] == this.options.name)
+ return key ? s[i][key] : s[i];
+
+ return undefined;
},
- initRun: function(init, action, cb)
+ get: function(key)
{
- return _luci2.rpc.call('luci2.system', 'init_action', { name: init, action: action }).then(function(response) {
- return retcb(cb, response[0] == 0);
- });
+ return L.NetworkModel._get('network', this.options.name, key);
},
- canInitRun: function(cb)
+ set: function(key, val)
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'init_action', cb);
+ return L.NetworkModel._set('network', this.options.name, key, val);
},
- initStart: function(init, cb) { return _luci2.system.initRun(init, 'start', cb) },
- initStop: function(init, cb) { return _luci2.system.initRun(init, 'stop', cb) },
- initRestart: function(init, cb) { return _luci2.system.initRun(init, 'restart', cb) },
- initReload: function(init, cb) { return _luci2.system.initRun(init, 'reload', cb) },
- initEnable: function(init, cb) { return _luci2.system.initRun(init, 'enable', cb) },
- initDisable: function(init, cb) { return _luci2.system.initRun(init, 'disable', cb) },
-
-
- getRcLocal: function(cb)
+ name: function()
{
- return rcall('luci2.system', 'rclocal_get', undefined, 'data', '', cb);
+ return this.options.name;
},
- setRcLocal: function(data, cb)
+ protocol: function()
{
- return rcall('luci2.system', 'rclocal_set', { data: data }, undefined, undefined, cb);
+ return (this.get('proto') || 'none');
},
- canSetRcLocal: function(cb)
+ isUp: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'rclocal_set', cb);
+ return (this._status('up') === true);
},
-
- getCrontab: function(cb)
+ isVirtual: function()
{
- return rcall('luci2.system', 'crontab_get', undefined, 'data', '', cb);
+ return (typeof(this.options.sid) != 'string');
},
- setCrontab: function(data, cb)
+ getProtocol: function()
{
- return rcall('luci2.system', 'crontab_set', { data: data }, undefined, undefined, cb);
+ var prname = this.get('proto') || 'none';
+ return L.NetworkModel._protos[prname] || L.NetworkModel._protos.none;
},
- canSetCrontab: function(cb)
+ getUptime: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'crontab_set', cb);
+ var uptime = this._status('uptime');
+ return isNaN(uptime) ? 0 : uptime;
},
-
- getSSHKeys: function(cb)
+ getDevice: function(resolveAlias)
{
- return rcall('luci2.system', 'sshkeys_get', undefined, 'keys', [ ], cb);
+ if (this.options.l3dev)
+ return L.NetworkModel.getDevice(this.options.l3dev);
+
+ return undefined;
},
- setSSHKeys: function(keys, cb)
+ getPhysdev: function()
{
- return rcall('luci2.system', 'sshkeys_set', { keys: keys }, undefined, undefined, cb);
+ if (this.options.l2dev)
+ return L.NetworkModel.getDevice(this.options.l2dev);
+
+ return undefined;
},
- canSetSSHKeys: function(cb)
+ getSubdevices: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'sshkeys_set', cb);
- },
+ var rv = [ ];
+ var dev = this.options.l2dev ?
+ L.NetworkModel._devs[this.options.l2dev] : undefined;
+ if (dev && dev.kind == 'bridge' && dev.ports && dev.ports.length)
+ for (var i = 0; i < dev.ports.length; i++)
+ rv.push(L.NetworkModel.getDevice(dev.ports[i]));
- setPassword: function(user, pass, cb)
- {
- return rcall('luci2.system', 'password_set', { user: user, password: pass }, undefined, undefined, cb);
+ return rv;
},
- canSetPassword: function(cb)
+ getIPv4Addrs: function(mask)
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'password_set', cb);
- },
+ var rv = [ ];
+ var addrs = this._status('ipv4-address');
+ if (addrs)
+ for (var i = 0; i < addrs.length; i++)
+ if (!mask)
+ rv.push(addrs[i].address);
+ else
+ rv.push('%s/%d'.format(addrs[i].address, addrs[i].mask));
- listLEDs: function(cb)
- {
- return rcall('luci2.system', 'led_list', undefined, 'leds', [ ], cb);
+ return rv;
},
- listUSBDevices: function(cb)
+ getIPv6Addrs: function(mask)
{
- return rcall('luci2.system', 'usb_list', undefined, 'devices', [ ], cb);
- },
+ var rv = [ ];
+ var addrs;
+ addrs = this._status('ipv6-address');
- testUpgrade: function(cb)
- {
- return rcall('luci2.system', 'upgrade_test', undefined, undefined, { }, cb);
+ if (addrs)
+ for (var i = 0; i < addrs.length; i++)
+ if (!mask)
+ rv.push(addrs[i].address);
+ else
+ rv.push('%s/%d'.format(addrs[i].address, addrs[i].mask));
+
+ addrs = this._status('ipv6-prefix-assignment');
+
+ if (addrs)
+ for (var i = 0; i < addrs.length; i++)
+ if (!mask)
+ rv.push('%s1'.format(addrs[i].address));
+ else
+ rv.push('%s1/%d'.format(addrs[i].address, addrs[i].mask));
+
+ return rv;
},
- startUpgrade: function(keep, cb)
+ getDNSAddrs: function()
{
- return rcall('luci2.system', 'upgrade_start', { keep: !!keep }, undefined, undefined, cb);
+ var rv = [ ];
+ var addrs = this._status('dns-server');
+
+ if (addrs)
+ for (var i = 0; i < addrs.length; i++)
+ rv.push(addrs[i]);
+
+ return rv;
},
- cleanUpgrade: function(cb)
+ getIPv4DNS: function()
{
- return rcall('luci2.system', 'upgrade_clean', undefined, undefined, undefined, cb);
+ var rv = [ ];
+ var dns = this._status('dns-server');
+
+ if (dns)
+ for (var i = 0; i < dns.length; i++)
+ if (dns[i].indexOf(':') == -1)
+ rv.push(dns[i]);
+
+ return rv;
},
- canUpgrade: function(cb)
+ getIPv6DNS: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'upgrade_start', cb);
- },
+ var rv = [ ];
+ var dns = this._status('dns-server');
+ if (dns)
+ for (var i = 0; i < dns.length; i++)
+ if (dns[i].indexOf(':') > -1)
+ rv.push(dns[i]);
- restoreBackup: function(cb)
- {
- return rcall('luci2.system', 'backup_restore', undefined, undefined, undefined, cb);
+ return rv;
},
- cleanBackup: function(cb)
+ getIPv4Gateway: function()
{
- return rcall('luci2.system', 'backup_clean', undefined, undefined, undefined, cb);
+ var rt = this._status('route');
+
+ if (rt)
+ for (var i = 0; i < rt.length; i++)
+ if (rt[i].target == '0.0.0.0' && rt[i].mask == 0)
+ return rt[i].nexthop;
+
+ return undefined;
},
- canRestoreBackup: function(cb)
+ getIPv6Gateway: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'backup_restore', cb);
- },
+ var rt = this._status('route');
+ if (rt)
+ for (var i = 0; i < rt.length; i++)
+ if (rt[i].target == '::' && rt[i].mask == 0)
+ return rt[i].nexthop;
- getBackupConfig: function(cb)
- {
- return rcall('luci2.system', 'backup_config_get', undefined, 'config', '', cb);
+ return undefined;
},
- setBackupConfig: function(data, cb)
+ getStatistics: function()
{
- return rcall('luci2.system', 'backup_config_set', { data: data }, undefined, undefined, cb);
+ var dev = this.getDevice() || new L.NetworkModel.Device({});
+ return dev.getStatistics();
},
- canSetBackupConfig: function(cb)
+ getTrafficHistory: function()
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'backup_config_set', cb);
+ var dev = this.getDevice() || new L.NetworkModel.Device({});
+ return dev.getTrafficHistory();
},
-
- listBackup: function(cb)
+ renderBadge: function()
{
- return rcall('luci2.system', 'backup_list', undefined, 'files', [ ], cb);
- },
+ var badge = $('')
+ .addClass('badge')
+ .text('%s: '.format(this.name()));
+ var dev = this.getDevice();
+ var subdevs = this.getSubdevices();
- performReboot: function(cb)
- {
- return rcall('luci2.system', 'reboot', undefined, undefined, undefined, cb);
+ if (subdevs.length)
+ for (var j = 0; j < subdevs.length; j++)
+ badge.append($('![]()
')
+ .attr('src', subdevs[j].icon())
+ .attr('title', '%s (%s)'.format(subdevs[j].description(), subdevs[j].name() || '?')));
+ else if (dev)
+ badge.append($('![]()
')
+ .attr('src', dev.icon())
+ .attr('title', '%s (%s)'.format(dev.description(), dev.name() || '?')));
+ else
+ badge.append($('').text(L.tr('(No devices attached)')));
+
+ return badge;
},
- canPerformReboot: function(cb)
+ setDevices: function(devs)
{
- return _luci2.rpc.access('ubus', 'luci2.system', 'reboot', cb);
- }
- };
+ var dev = this.getPhysdev();
+ var old_devs = [ ];
+ var changed = false;
+
+ if (dev && dev.isBridge())
+ old_devs = this.getSubdevices();
+ else if (dev)
+ old_devs = [ dev ];
+
+ if (old_devs.length != devs.length)
+ changed = true;
+ else
+ for (var i = 0; i < old_devs.length; i++)
+ {
+ var dev = devs[i];
+
+ if (dev instanceof L.NetworkModel.Device)
+ dev = dev.name();
+
+ if (!dev || old_devs[i].name() != dev)
+ {
+ changed = true;
+ break;
+ }
+ }
+
+ if (changed)
+ {
+ for (var i = 0; i < old_devs.length; i++)
+ old_devs[i].removeFromInterface(this);
+
+ for (var i = 0; i < devs.length; i++)
+ {
+ var dev = devs[i];
- this.opkg = {
- updateLists: function(cb)
+ if (!(dev instanceof L.NetworkModel.Device))
+ dev = L.NetworkModel.getDevice(dev);
+
+ if (dev)
+ dev.attachToInterface(this);
+ }
+ }
+ },
+
+ changeProtocol: function(proto)
{
- return rcall('luci2.opkg', 'update', undefined, undefined, { }, cb);
+ var pr = L.NetworkModel._protos[proto];
+
+ if (!pr)
+ return;
+
+ for (var opt in (this.get() || { }))
+ {
+ switch (opt)
+ {
+ case 'type':
+ case 'ifname':
+ case 'macaddr':
+ if (pr.virtual)
+ this.set(opt, undefined);
+ break;
+
+ case 'auto':
+ case 'mtu':
+ break;
+
+ case 'proto':
+ this.set(opt, pr.protocol);
+ break;
+
+ default:
+ this.set(opt, undefined);
+ break;
+ }
+ }
},
- _fetchPackages: function(action, offset, limit, pattern, cb)
+ createForm: function(mapwidget)
{
- var packages = [ ];
- var reqlimit = Math.min(limit, 100);
+ var self = this;
+ var proto = self.getProtocol();
+ var device = self.getDevice();
+
+ if (!mapwidget)
+ mapwidget = L.cbi.Map;
+
+ var map = new mapwidget('network', {
+ caption: L.tr('Configure "%s"').format(self.name())
+ });
+
+ var section = map.section(L.cbi.SingleSection, self.name(), {
+ anonymous: true
+ });
+
+ section.tab({
+ id: 'general',
+ caption: L.tr('General Settings')
+ });
+
+ section.tab({
+ id: 'advanced',
+ caption: L.tr('Advanced Settings')
+ });
+
+ section.tab({
+ id: 'ipv6',
+ caption: L.tr('IPv6')
+ });
+
+ section.tab({
+ id: 'physical',
+ caption: L.tr('Physical Settings')
+ });
+
+
+ section.taboption('general', L.cbi.CheckboxValue, 'auto', {
+ caption: L.tr('Start on boot'),
+ optional: true,
+ initial: true
+ });
+
+ var pr = section.taboption('general', L.cbi.ListValue, 'proto', {
+ caption: L.tr('Protocol')
+ });
+
+ pr.ucivalue = function(sid) {
+ return self.get('proto') || 'none';
+ };
- if (reqlimit <= 0)
- reqlimit = 100;
+ var ok = section.taboption('general', L.cbi.ButtonValue, '_confirm', {
+ caption: L.tr('Really switch?'),
+ description: L.tr('Changing the protocol will clear all configuration for this interface!'),
+ text: L.tr('Change protocol')
+ });
+
+ ok.on('click', function(ev) {
+ self.changeProtocol(pr.formvalue(ev.data.sid));
+ self.createForm(mapwidget).show();
+ });
- return _luci2.rpc.call('luci2.opkg', action, { offset: offset, limit: reqlimit, pattern: pattern }).then(function(response) {
- if (response[0] != 0 || !response[1] || !response[1].total)
- return retcb(cb, { length: 0, total: 0 });
+ var protos = L.NetworkModel.getProtocols();
- packages.push.apply(packages, response[1].packages);
- packages.total = response[1].total;
+ for (var i = 0; i < protos.length; i++)
+ pr.value(protos[i].name, protos[i].description);
- if (limit <= 0)
- limit = response[1].total;
+ proto.populateForm(section, self);
- if (packages.length >= limit)
- return retcb(cb, packages);
+ if (!proto.virtual)
+ {
+ var br = section.taboption('physical', L.cbi.CheckboxValue, 'type', {
+ caption: L.tr('Network bridge'),
+ description: L.tr('Merges multiple devices into one logical bridge'),
+ optional: true,
+ enabled: 'bridge',
+ disabled: '',
+ initial: ''
+ });
- var requests = [ ];
- for (var i = offset + packages.length; i < limit; i += 100)
- requests.push(['luci2.opkg', action, { offset: i, limit: (Math.min(i + 100, limit) % 100) || 100, pattern: pattern }]);
+ section.taboption('physical', L.cbi.DeviceList, '__iface_multi', {
+ caption: L.tr('Devices'),
+ multiple: true,
+ bridges: false
+ }).depends('type', true);
+
+ section.taboption('physical', L.cbi.DeviceList, '__iface_single', {
+ caption: L.tr('Device'),
+ multiple: false,
+ bridges: true
+ }).depends('type', false);
+
+ var mac = section.taboption('physical', L.cbi.InputValue, 'macaddr', {
+ caption: L.tr('Override MAC'),
+ optional: true,
+ placeholder: device ? device.getMACAddress() : undefined,
+ datatype: 'macaddr'
+ })
- return _luci2.rpc.call(requests);
- }).then(function(responses) {
- for (var key in responses)
+ mac.ucivalue = function(sid)
{
- var response = responses[key];
+ if (device)
+ return device.get('macaddr');
- if (response[0] != 0 || !response[1] || !response[1].packages)
- continue;
+ return this.callSuper('ucivalue', sid);
+ };
- packages.push.apply(packages, response[1].packages);
- packages.total = response[1].total;
- }
+ mac.save = function(sid)
+ {
+ if (!this.changed(sid))
+ return false;
+
+ if (device)
+ device.set('macaddr', this.formvalue(sid));
+ else
+ this.callSuper('set', sid);
+
+ return true;
+ };
+ }
- return retcb(cb, packages);
+ section.taboption('physical', L.cbi.InputValue, 'mtu', {
+ caption: L.tr('Override MTU'),
+ optional: true,
+ placeholder: device ? device.getMTU() : undefined,
+ datatype: 'range(1, 9000)'
});
- },
- listPackages: function(offset, limit, pattern, cb)
- {
- return _luci2.opkg._fetchPackages('list', offset, limit, pattern, cb);
- },
+ section.taboption('physical', L.cbi.InputValue, 'metric', {
+ caption: L.tr('Override Metric'),
+ optional: true,
+ placeholder: 0,
+ datatype: 'uinteger'
+ });
+
+ for (var field in section.fields)
+ {
+ switch (field)
+ {
+ case 'proto':
+ break;
+
+ case '_confirm':
+ for (var i = 0; i < protos.length; i++)
+ if (protos[i].name != (this.get('proto') || 'none'))
+ section.fields[field].depends('proto', protos[i].name);
+ break;
+
+ default:
+ section.fields[field].depends('proto', this.get('proto') || 'none', true);
+ break;
+ }
+ }
+
+ return map;
+ }
+ });
- installedPackages: function(offset, limit, pattern, cb)
+ this.NetworkModel.Protocol = this.NetworkModel.Interface.extend({
+ description: '__unknown__',
+ tunnel: false,
+ virtual: false,
+
+ populateForm: function(section, iface)
{
- return _luci2.opkg._fetchPackages('list_installed', offset, limit, pattern, cb);
- },
- findPackages: function(offset, limit, pattern, cb)
+ }
+ });
+
+ this.system = {
+ getSystemInfo: L.rpc.declare({
+ object: 'system',
+ method: 'info',
+ expect: { '': { } }
+ }),
+
+ getBoardInfo: L.rpc.declare({
+ object: 'system',
+ method: 'board',
+ expect: { '': { } }
+ }),
+
+ getDiskInfo: L.rpc.declare({
+ object: 'luci2.system',
+ method: 'diskfree',
+ expect: { '': { } }
+ }),
+
+ getInfo: function(cb)
{
- return _luci2.opkg._fetchPackages('find', offset, limit, pattern, cb);
+ L.rpc.batch();
+
+ this.getSystemInfo();
+ this.getBoardInfo();
+ this.getDiskInfo();
+
+ return L.rpc.flush().then(function(info) {
+ var rv = { };
+
+ $.extend(rv, info[0]);
+ $.extend(rv, info[1]);
+ $.extend(rv, info[2]);
+
+ return rv;
+ });
},
- installPackage: function(name, cb)
+
+ initList: L.rpc.declare({
+ object: 'luci2.system',
+ method: 'init_list',
+ expect: { initscripts: [ ] },
+ filter: function(data) {
+ data.sort(function(a, b) { return (a.start || 0) - (b.start || 0) });
+ return data;
+ }
+ }),
+
+ initEnabled: function(init, cb)
{
- return rcall('luci2.opkg', 'install', { 'package': name }, undefined, { }, cb);
+ return this.initList().then(function(list) {
+ for (var i = 0; i < list.length; i++)
+ if (list[i].name == init)
+ return !!list[i].enabled;
+
+ return false;
+ });
},
- removePackage: function(name, cb)
+ initRun: L.rpc.declare({
+ object: 'luci2.system',
+ method: 'init_action',
+ params: [ 'name', 'action' ],
+ filter: function(data) {
+ return (data == 0);
+ }
+ }),
+
+ initStart: function(init, cb) { return L.system.initRun(init, 'start', cb) },
+ initStop: function(init, cb) { return L.system.initRun(init, 'stop', cb) },
+ initRestart: function(init, cb) { return L.system.initRun(init, 'restart', cb) },
+ initReload: function(init, cb) { return L.system.initRun(init, 'reload', cb) },
+ initEnable: function(init, cb) { return L.system.initRun(init, 'enable', cb) },
+ initDisable: function(init, cb) { return L.system.initRun(init, 'disable', cb) },
+
+
+ performReboot: L.rpc.declare({
+ object: 'luci2.system',
+ method: 'reboot'
+ })
+ };
+
+ this.session = {
+
+ login: L.rpc.declare({
+ object: 'session',
+ method: 'login',
+ params: [ 'username', 'password' ],
+ expect: { '': { } }
+ }),
+
+ access: L.rpc.declare({
+ object: 'session',
+ method: 'access',
+ params: [ 'scope', 'object', 'function' ],
+ expect: { access: false }
+ }),
+
+ isAlive: function()
{
- return rcall('luci2.opkg', 'remove', { 'package': name }, undefined, { }, cb);
+ return L.session.access('ubus', 'session', 'access');
},
- getConfig: function(cb)
+ startHeartbeat: function()
{
- return rcall('luci2.opkg', 'config_get', undefined, 'config', '', cb);
+ this._hearbeatInterval = window.setInterval(function() {
+ L.session.isAlive().then(function(alive) {
+ if (!alive)
+ {
+ L.session.stopHeartbeat();
+ L.ui.login(true);
+ }
+
+ });
+ }, L.globals.timeout * 2);
},
- setConfig: function(data, cb)
+ stopHeartbeat: function()
{
- return rcall('luci2.opkg', 'config_set', { data: data }, undefined, undefined, cb);
+ if (typeof(this._hearbeatInterval) != 'undefined')
+ {
+ window.clearInterval(this._hearbeatInterval);
+ delete this._hearbeatInterval;
+ }
},
- canInstallPackage: function(cb)
+
+ _acls: { },
+
+ _fetch_acls: L.rpc.declare({
+ object: 'session',
+ method: 'access',
+ expect: { '': { } }
+ }),
+
+ _fetch_acls_cb: function(acls)
{
- return _luci2.rpc.access('ubus', 'luci2.opkg', 'install', cb);
+ L.session._acls = acls;
},
- canRemovePackage: function(cb)
+ updateACLs: function()
{
- return _luci2.rpc.access('ubus', 'luci2.opkg', 'remove', cb);
+ return L.session._fetch_acls()
+ .then(L.session._fetch_acls_cb);
},
- canSetConfig: function(cb)
+ hasACL: function(scope, object, func)
{
- return _luci2.rpc.access('ubus', 'luci2.opkg', 'config_set', cb);
+ var acls = L.session._acls;
+
+ if (typeof(func) == 'undefined')
+ return (acls && acls[scope] && acls[scope][object]);
+
+ if (acls && acls[scope] && acls[scope][object])
+ for (var i = 0; i < acls[scope][object].length; i++)
+ if (acls[scope][object][i] == func)
+ return true;
+
+ return false;
}
};
this.ui = {
+ saveScrollTop: function()
+ {
+ this._scroll_top = $(document).scrollTop();
+ },
+
+ restoreScrollTop: function()
+ {
+ if (typeof(this._scroll_top) == 'undefined')
+ return;
+
+ $(document).scrollTop(this._scroll_top);
+
+ delete this._scroll_top;
+ },
+
loading: function(enable)
{
var win = $(window);
var body = $('body');
- var div = _luci2._modal || (
- _luci2._modal = $('')
- .addClass('cbi-modal-loader')
- .append($('').text(_luci2.tr('Loading data...')))
+
+ var state = L.ui._loading || (L.ui._loading = {
+ modal: $('')
+ .css('z-index', 2000)
+ .addClass('modal fade')
+ .append($('')
+ .addClass('modal-dialog')
+ .append($('')
+ .addClass('modal-content luci2-modal-loader')
+ .append($('')
+ .addClass('modal-body')
+ .text(L.tr('Loading dataâ¦')))))
.appendTo(body)
- );
+ .modal({
+ backdrop: 'static',
+ keyboard: false
+ })
+ });
- if (enable)
- {
- body.css('overflow', 'hidden');
- body.css('padding', 0);
- body.css('width', win.width());
- body.css('height', win.height());
- div.css('width', win.width());
- div.css('height', win.height());
- div.show();
- }
- else
- {
- div.hide();
- body.css('overflow', '');
- body.css('padding', '');
- body.css('width', '');
- body.css('height', '');
- }
+ state.modal.modal(enable ? 'show' : 'hide');
},
dialog: function(title, content, options)
{
var win = $(window);
var body = $('body');
- var div = _luci2._dialog || (
- _luci2._dialog = $('')
- .addClass('cbi-modal-dialog')
+
+ var state = L.ui._dialog || (L.ui._dialog = {
+ dialog: $('')
+ .addClass('modal fade')
.append($('')
+ .addClass('modal-dialog')
.append($('')
- .addClass('cbi-modal-dialog-header'))
- .append($('')
- .addClass('cbi-modal-dialog-body'))
- .append($('')
- .addClass('cbi-modal-dialog-footer')
- .append($('')
- .addClass('cbi-button')
- .text(_luci2.tr('Close'))
- .click(function() {
- $('body')
- .css('overflow', '')
- .css('padding', '')
- .css('width', '')
- .css('height', '');
-
- $(this).parent().parent().parent().hide();
- }))))
+ .addClass('modal-content')
+ .append($('')
+ .addClass('modal-header')
+ .append('')
+ .addClass('modal-title'))
+ .append($('')
+ .addClass('modal-body'))
+ .append($('')
+ .addClass('modal-footer')
+ .append(L.ui.button(L.tr('Close'), 'primary')
+ .click(function() {
+ $(this).parents('div.modal').modal('hide');
+ })))))
.appendTo(body)
- );
+ });
if (typeof(options) != 'object')
options = { };
if (title === false)
{
- body
- .css('overflow', '')
- .css('padding', '')
- .css('width', '')
- .css('height', '');
+ state.dialog.modal('hide');
- _luci2._dialog.hide();
-
- return;
+ return state.dialog;
}
- var cnt = div.children().children('div.cbi-modal-dialog-body');
- var ftr = div.children().children('div.cbi-modal-dialog-footer');
+ var cnt = state.dialog.children().children().children('div.modal-body');
+ var ftr = state.dialog.children().children().children('div.modal-footer');
- ftr.empty();
+ ftr.empty().show();
if (options.style == 'confirm')
{
- ftr.append($('')
- .addClass('cbi-button')
- .text(_luci2.tr('Ok'))
- .click(options.confirm || function() { _luci2.ui.dialog(false) }));
+ ftr.append(L.ui.button(L.tr('Ok'), 'primary')
+ .click(options.confirm || function() { L.ui.dialog(false) }));
- ftr.append($('')
- .addClass('cbi-button')
- .text(_luci2.tr('Cancel'))
- .click(options.cancel || function() { _luci2.ui.dialog(false) }));
+ ftr.append(L.ui.button(L.tr('Cancel'), 'default')
+ .click(options.cancel || function() { L.ui.dialog(false) }));
}
else if (options.style == 'close')
{
- ftr.append($('')
- .addClass('cbi-button')
- .text(_luci2.tr('Close'))
- .click(options.close || function() { _luci2.ui.dialog(false) }));
+ ftr.append(L.ui.button(L.tr('Close'), 'primary')
+ .click(options.close || function() { L.ui.dialog(false) }));
}
else if (options.style == 'wait')
{
- ftr.append($('')
- .addClass('cbi-button')
- .text(_luci2.tr('Close'))
+ ftr.append(L.ui.button(L.tr('Close'), 'primary')
.attr('disabled', true));
}
- div.find('div.cbi-modal-dialog-header').text(title);
- div.show();
+ if (options.wide)
+ {
+ state.dialog.addClass('wide');
+ }
+ else
+ {
+ state.dialog.removeClass('wide');
+ }
- cnt
- .css('max-height', Math.floor(win.height() * 0.70) + 'px')
- .empty()
- .append(content);
+ state.dialog.find('h4:first').text(title);
+ state.dialog.modal('show');
- div.children()
- .css('margin-top', -Math.floor(div.children().height() / 2) + 'px');
+ cnt.empty().append(content);
- body.css('overflow', 'hidden');
- body.css('padding', 0);
- body.css('width', win.width());
- body.css('height', win.height());
- div.css('width', win.width());
- div.css('height', win.height());
+ return state.dialog;
},
upload: function(title, content, options)
{
- var form = _luci2._upload || (
- _luci2._upload = $('')
+ var state = L.ui._upload || (L.ui._upload = {
+ form: $('')
.attr('method', 'post')
.attr('action', '/cgi-bin/luci-upload')
.attr('enctype', 'multipart/form-data')
@@ -1550,31 +3305,28 @@ function LuCI2()
.append($(''))
.append($('')
.attr('type', 'hidden')
- .attr('name', 'sessionid')
- .attr('value', _luci2.globals.sid))
+ .attr('name', 'sessionid'))
.append($('')
.attr('type', 'hidden')
- .attr('name', 'filename')
- .attr('value', options.filename))
+ .attr('name', 'filename'))
.append($('')
.attr('type', 'file')
.attr('name', 'filedata')
.addClass('cbi-input-file'))
.append($('')
.css('width', '100%')
- .addClass('progressbar')
- .addClass('intermediate')
+ .addClass('progress progress-striped active')
.append($('')
+ .addClass('progress-bar')
.css('width', '100%')))
.append($('')
+ .addClass('pull-right')
.attr('name', 'cbi-fileupload-frame')
.css('width', '1px')
.css('height', '1px')
- .css('visibility', 'hidden'))
- );
+ .css('visibility', 'hidden')),
- var finish = _luci2._upload_finish_cb || (
- _luci2._upload_finish_cb = function(ev) {
+ finish_cb: function(ev) {
$(this).off('load');
var body = (this.contentDocument || this.contentWindow.document).body;
@@ -1586,54 +3338,56 @@ function LuCI2()
json = $.parseJSON(body.innerHTML);
} catch(e) {
json = {
- message: _luci2.tr('Invalid server response received'),
- error: [ -1, _luci2.tr('Invalid data') ]
+ message: L.tr('Invalid server response received'),
+ error: [ -1, L.tr('Invalid data') ]
};
};
if (json.error)
{
L.ui.dialog(L.tr('File upload'), [
- $('').text(_luci2.tr('The file upload failed with the server response below:')),
+ $('').text(L.tr('The file upload failed with the server response below:')),
$('').addClass('alert-message').text(json.message || json.error[1]),
- $('').text(_luci2.tr('In case of network problems try uploading the file again.'))
+ $('').text(L.tr('In case of network problems try uploading the file again.'))
], { style: 'close' });
}
- else if (typeof(ev.data.cb) == 'function')
+ else if (typeof(state.success_cb) == 'function')
{
- ev.data.cb(json);
+ state.success_cb(json);
}
- }
- );
+ },
- var confirm = _luci2._upload_confirm_cb || (
- _luci2._upload_confirm_cb = function() {
- var d = _luci2._upload;
- var f = d.find('.cbi-input-file');
- var b = d.find('.progressbar');
- var p = d.find('p');
+ confirm_cb: function() {
+ var f = state.form.find('.cbi-input-file');
+ var b = state.form.find('.progress');
+ var p = state.form.find('p');
if (!f.val())
return;
- d.find('iframe').on('load', { cb: options.success }, finish);
- d.submit();
+ state.form.find('iframe').on('load', state.finish_cb);
+ state.form.submit();
f.hide();
b.show();
- p.text(_luci2.tr('File upload in progress â¦'));
+ p.text(L.tr('File upload in progress â¦'));
- _luci2._dialog.find('button').prop('disabled', true);
+ state.form.parent().parent().find('button').prop('disabled', true);
}
- );
+ });
+
+ state.form.find('.progress').hide();
+ state.form.find('.cbi-input-file').val('').show();
+ state.form.find('p').text(content || L.tr('Select the file to upload and press "%s" to proceed.').format(L.tr('Ok')));
- _luci2._upload.find('.progressbar').hide();
- _luci2._upload.find('.cbi-input-file').val('').show();
- _luci2._upload.find('p').text(content || _luci2.tr('Select the file to upload and press "%s" to proceed.').format(_luci2.tr('Ok')));
+ state.form.find('[name=sessionid]').val(L.globals.sid);
+ state.form.find('[name=filename]').val(options.filename);
- _luci2.ui.dialog(title || _luci2.tr('File upload'), _luci2._upload, {
+ state.success_cb = options.success;
+
+ L.ui.dialog(title || L.tr('File upload'), state.form, {
style: 'confirm',
- confirm: confirm
+ confirm: state.confirm_cb
});
},
@@ -1645,9 +3399,9 @@ function LuCI2()
var images = $();
var interval, timeout;
- _luci2.ui.dialog(
- _luci2.tr('Waiting for device'), [
- $('').text(_luci2.tr('Please stand by while the device is reconfiguring â¦')),
+ L.ui.dialog(
+ L.tr('Waiting for device'), [
+ $('').text(L.tr('Please stand by while the device is reconfiguring â¦')),
$('')
.css('width', '100%')
.addClass('progressbar')
@@ -1660,7 +3414,7 @@ function LuCI2()
for (var i = 0; i < protocols.length; i++)
images = images.add($('![]()
').attr('url', protocols[i] + '://' + address + ':' + ports[i]));
- //_luci2.network.getNetworkStatus(function(s) {
+ //L.network.getNetworkStatus(function(s) {
// for (var i = 0; i < protocols.length; i++)
// {
// for (var j = 0; j < s.length; j++)
@@ -1675,12 +3429,12 @@ function LuCI2()
//}).then(function() {
images.on('load', function() {
var url = this.getAttribute('url');
- _luci2.rpc.access('ubus', 'session', 'access').then(function(response) {
- if (response[0] == 0)
+ L.session.isAlive().then(function(access) {
+ if (access)
{
window.clearTimeout(timeout);
window.clearInterval(interval);
- _luci2.ui.dialog(false);
+ L.ui.dialog(false);
images = null;
}
else
@@ -1692,7 +3446,7 @@ function LuCI2()
interval = window.setInterval(function() {
images.each(function() {
- this.setAttribute('src', this.getAttribute('url') + _luci2.globals.resource + '/icons/loading.gif?r=' + Math.random());
+ this.setAttribute('src', this.getAttribute('url') + L.globals.resource + '/icons/loading.gif?r=' + Math.random());
});
}, 5000);
@@ -1700,9 +3454,9 @@ function LuCI2()
window.clearInterval(interval);
images.off('load');
- _luci2.ui.dialog(
- _luci2.tr('Device not responding'),
- _luci2.tr('The device was not responding within 180 seconds, you might need to manually reconnect your computer or use SSH to regain access.'),
+ L.ui.dialog(
+ L.tr('Device not responding'),
+ L.tr('The device was not responding within 180 seconds, you might need to manually reconnect your computer or use SSH to regain access.'),
{ style: 'close' }
);
}, 180000);
@@ -1711,84 +3465,66 @@ function LuCI2()
login: function(invalid)
{
- if (!_luci2._login_deferred || _luci2._login_deferred.state() != 'pending')
- _luci2._login_deferred = $.Deferred();
-
- /* try to find sid from hash */
- var sid = _luci2.getHash('id');
- if (sid && sid.match(/^[a-f0-9]{32}$/))
- {
- _luci2.globals.sid = sid;
- _luci2.rpc.access('ubus', 'session', 'access').then(function(response) {
- if (response[0] == 0)
- {
- _luci2._login_deferred.resolve();
- }
- else
- {
- _luci2.setHash('id', undefined);
- _luci2.ui.login();
- }
- });
-
- return _luci2._login_deferred;
- }
-
- var form = _luci2._login || (
- _luci2._login = $('')
+ var state = L.ui._login || (L.ui._login = {
+ form: $('')
+ .attr('target', '')
+ .attr('method', 'post')
.append($('')
.addClass('alert-message')
- .text(_luci2.tr('Wrong username or password given!')))
+ .text(L.tr('Wrong username or password given!')))
.append($('')
.append($('')
- .text(_luci2.tr('Username'))
+ .text(L.tr('Username'))
.append($('
'))
.append($('')
.attr('type', 'text')
.attr('name', 'username')
.attr('value', 'root')
- .addClass('cbi-input-text'))))
+ .addClass('form-control')
+ .keypress(function(ev) {
+ if (ev.which == 10 || ev.which == 13)
+ state.confirm_cb();
+ }))))
.append($('')
.append($('')
- .text(_luci2.tr('Password'))
+ .text(L.tr('Password'))
.append($('
'))
.append($('')
.attr('type', 'password')
.attr('name', 'password')
- .addClass('cbi-input-password'))))
+ .addClass('form-control')
+ .keypress(function(ev) {
+ if (ev.which == 10 || ev.which == 13)
+ state.confirm_cb();
+ }))))
.append($('')
- .text(_luci2.tr('Enter your username and password above, then click "%s" to proceed.').format(_luci2.tr('Ok'))))
- );
+ .text(L.tr('Enter your username and password above, then click "%s" to proceed.').format(L.tr('Ok')))),
- var response = _luci2._login_response_cb || (
- _luci2._login_response_cb = function(data) {
- if (typeof(data) == 'object' && typeof(data.sessionid) == 'string')
+ response_cb: function(response) {
+ if (!response.ubus_rpc_session)
{
- _luci2.globals.sid = data.sessionid;
- _luci2.setHash('id', _luci2.globals.sid);
-
- _luci2.ui.dialog(false);
- _luci2._login_deferred.resolve();
+ L.ui.login(true);
}
else
{
- _luci2.ui.login(true);
+ L.globals.sid = response.ubus_rpc_session;
+ L.setHash('id', L.globals.sid);
+ L.session.startHeartbeat();
+ L.ui.dialog(false);
+ state.deferred.resolve();
}
- }
- );
+ },
- var confirm = _luci2._login_confirm_cb || (
- _luci2._login_confirm_cb = function() {
- var d = _luci2._login;
- var u = d.find('[name=username]').val();
- var p = d.find('[name=password]').val();
+ confirm_cb: function() {
+ var u = state.form.find('[name=username]').val();
+ var p = state.form.find('[name=password]').val();
if (!u)
return;
- _luci2.ui.dialog(
- _luci2.tr('Logging in'), [
- $('').text(_luci2.tr('Log in in progress â¦')),
+ L.ui.dialog(
+ L.tr('Logging in'), [
+ $('').text(L.tr('Log in in progress â¦')),
$('')
.css('width', '100%')
.addClass('progressbar')
@@ -1798,119 +3534,435 @@ function LuCI2()
], { style: 'wait' }
);
- $.ajax('/cgi-bin/luci-login', {
- type: 'POST',
- cache: false,
- data: { username: u, password: p },
- dataType: 'json',
- success: response,
- error: response
- });
+ L.globals.sid = '00000000000000000000000000000000';
+ L.session.login(u, p).then(state.response_cb);
}
- );
+ });
+
+ if (!state.deferred || state.deferred.state() != 'pending')
+ state.deferred = $.Deferred();
+
+ /* try to find sid from hash */
+ var sid = L.getHash('id');
+ if (sid && sid.match(/^[a-f0-9]{32}$/))
+ {
+ L.globals.sid = sid;
+ L.session.isAlive().then(function(access) {
+ if (access)
+ {
+ L.session.startHeartbeat();
+ state.deferred.resolve();
+ }
+ else
+ {
+ L.setHash('id', undefined);
+ L.ui.login();
+ }
+ });
+
+ return state.deferred;
+ }
if (invalid)
- form.find('.alert-message').show();
+ state.form.find('.alert-message').show();
else
- form.find('.alert-message').hide();
+ state.form.find('.alert-message').hide();
- _luci2.ui.dialog(_luci2.tr('Authorization Required'), form, {
+ L.ui.dialog(L.tr('Authorization Required'), state.form, {
style: 'confirm',
- confirm: confirm
+ confirm: state.confirm_cb
});
- return _luci2._login_deferred;
+ state.form.find('[name=password]').focus();
+
+ return state.deferred;
+ },
+
+ cryptPassword: L.rpc.declare({
+ object: 'luci2.ui',
+ method: 'crypt',
+ params: [ 'data' ],
+ expect: { crypt: '' }
+ }),
+
+
+ _acl_merge_scope: function(acl_scope, scope)
+ {
+ if ($.isArray(scope))
+ {
+ for (var i = 0; i < scope.length; i++)
+ acl_scope[scope[i]] = true;
+ }
+ else if ($.isPlainObject(scope))
+ {
+ for (var object_name in scope)
+ {
+ if (!$.isArray(scope[object_name]))
+ continue;
+
+ var acl_object = acl_scope[object_name] || (acl_scope[object_name] = { });
+
+ for (var i = 0; i < scope[object_name].length; i++)
+ acl_object[scope[object_name][i]] = true;
+ }
+ }
+ },
+
+ _acl_merge_permission: function(acl_perm, perm)
+ {
+ if ($.isPlainObject(perm))
+ {
+ for (var scope_name in perm)
+ {
+ var acl_scope = acl_perm[scope_name] || (acl_perm[scope_name] = { });
+ this._acl_merge_scope(acl_scope, perm[scope_name]);
+ }
+ }
+ },
+
+ _acl_merge_group: function(acl_group, group)
+ {
+ if ($.isPlainObject(group))
+ {
+ if (!acl_group.description)
+ acl_group.description = group.description;
+
+ if (group.read)
+ {
+ var acl_perm = acl_group.read || (acl_group.read = { });
+ this._acl_merge_permission(acl_perm, group.read);
+ }
+
+ if (group.write)
+ {
+ var acl_perm = acl_group.write || (acl_group.write = { });
+ this._acl_merge_permission(acl_perm, group.write);
+ }
+ }
+ },
+
+ _acl_merge_tree: function(acl_tree, tree)
+ {
+ if ($.isPlainObject(tree))
+ {
+ for (var group_name in tree)
+ {
+ var acl_group = acl_tree[group_name] || (acl_tree[group_name] = { });
+ this._acl_merge_group(acl_group, tree[group_name]);
+ }
+ }
},
- renderMainMenu: function()
+ listAvailableACLs: L.rpc.declare({
+ object: 'luci2.ui',
+ method: 'acls',
+ expect: { acls: [ ] },
+ filter: function(trees) {
+ var acl_tree = { };
+ for (var i = 0; i < trees.length; i++)
+ L.ui._acl_merge_tree(acl_tree, trees[i]);
+ return acl_tree;
+ }
+ }),
+
+ _render_change_indicator: function()
{
- return rcall('luci2.ui', 'menu', undefined, 'menu', { }, function(entries) {
- _luci2.globals.mainMenu = new _luci2.ui.menu();
- _luci2.globals.mainMenu.entries(entries);
+ return $('')
+ .addClass('nav navbar-nav navbar-right')
+ .append($('')
+ .append($('')
+ .attr('id', 'changes')
+ .attr('href', '#')
+ .append($('')
+ .addClass('label label-info'))));
+ },
+
+ renderMainMenu: L.rpc.declare({
+ object: 'luci2.ui',
+ method: 'menu',
+ expect: { menu: { } },
+ filter: function(entries) {
+ L.globals.mainMenu = new L.ui.menu();
+ L.globals.mainMenu.entries(entries);
$('#mainmenu')
.empty()
- .append(_luci2.globals.mainMenu.render(0, 1));
- });
- },
+ .append(L.globals.mainMenu.render(0, 1))
+ .append(L.ui._render_change_indicator());
+ }
+ }),
renderViewMenu: function()
{
$('#viewmenu')
.empty()
- .append(_luci2.globals.mainMenu.render(2, 900));
+ .append(L.globals.mainMenu.render(2, 900));
},
- renderView: function(node)
+ renderView: function()
{
- var name = node.view.split(/\//).join('.');
+ var node = arguments[0];
+ var name = node.view.split(/\//).join('.');
+ var cname = L.toClassName(name);
+ var views = L.views || (L.views = { });
+ var args = [ ];
- _luci2.ui.renderViewMenu();
+ for (var i = 1; i < arguments.length; i++)
+ args.push(arguments[i]);
+
+ if (L.globals.currentView)
+ L.globals.currentView.finish();
- if (!_luci2._views)
- _luci2._views = { };
+ L.ui.renderViewMenu();
+ L.setHash('view', node.view);
- _luci2.setHash('view', node.view);
+ if (views[cname] instanceof L.ui.view)
+ {
+ L.globals.currentView = views[cname];
+ return views[cname].render.apply(views[cname], args);
+ }
- if (_luci2._views[name] instanceof _luci2.ui.view)
- return _luci2._views[name].render();
+ var url = L.globals.resource + '/view/' + name + '.js';
- return $.ajax(_luci2.globals.resource + '/view/' + name + '.js', {
+ return $.ajax(url, {
method: 'GET',
cache: true,
dataType: 'text'
}).then(function(data) {
try {
- var viewConstructor = (new Function(['L', '$'], 'return ' + data))(_luci2, $);
+ var viewConstructorSource = (
+ '(function(L, $) { ' +
+ 'return %s' +
+ '})(L, $);\n\n' +
+ '//@ sourceURL=%s'
+ ).format(data, url);
- _luci2._views[name] = new viewConstructor({
+ var viewConstructor = eval(viewConstructorSource);
+
+ views[cname] = new viewConstructor({
name: name,
acls: node.write || { }
});
- return _luci2._views[name].render();
+ L.globals.currentView = views[cname];
+ return views[cname].render.apply(views[cname], args);
}
- catch(e) { };
+ catch(e) {
+ alert('Unable to instantiate view "%s": %s'.format(url, e));
+ };
return $.Deferred().resolve();
});
},
+ changeView: function()
+ {
+ var name = L.getHash('view');
+ var node = L.globals.defaultNode;
+
+ if (name && L.globals.mainMenu)
+ node = L.globals.mainMenu.getNode(name);
+
+ if (node)
+ {
+ L.ui.loading(true);
+ L.ui.renderView(node).then(function() {
+ L.ui.loading(false);
+ });
+ }
+ },
+
+ updateHostname: function()
+ {
+ return L.system.getBoardInfo().then(function(info) {
+ if (info.hostname)
+ $('#hostname').text(info.hostname);
+ });
+ },
+
+ updateChanges: function()
+ {
+ return L.uci.changes().then(function(changes) {
+ var n = 0;
+ var html = '';
+
+ for (var config in changes)
+ {
+ var log = [ ];
+
+ for (var i = 0; i < changes[config].length; i++)
+ {
+ var c = changes[config][i];
+
+ switch (c[0])
+ {
+ case 'order':
+ log.push('uci reorder %s.%s=%s'.format(config, c[1], c[2]));
+ break;
+
+ case 'remove':
+ if (c.length < 3)
+ log.push('uci delete %s.%s'.format(config, c[1]));
+ else
+ log.push('uci delete %s.%s.%s'.format(config, c[1], c[2]));
+ break;
+
+ case 'rename':
+ if (c.length < 4)
+ log.push('uci rename %s.%s=%s'.format(config, c[1], c[2], c[3]));
+ else
+ log.push('uci rename %s.%s.%s=%s'.format(config, c[1], c[2], c[3], c[4]));
+ break;
+
+ case 'add':
+ log.push('uci add %s %s (= %s)'.format(config, c[2], c[1]));
+ break;
+
+ case 'list-add':
+ log.push('uci add_list %s.%s.%s=%s'.format(config, c[1], c[2], c[3], c[4]));
+ break;
+
+ case 'list-del':
+ log.push('uci del_list %s.%s.%s=%s'.format(config, c[1], c[2], c[3], c[4]));
+ break;
+
+ case 'set':
+ if (c.length < 4)
+ log.push('uci set %s.%s=%s'.format(config, c[1], c[2]));
+ else
+ log.push('uci set %s.%s.%s=%s'.format(config, c[1], c[2], c[3], c[4]));
+ break;
+ }
+ }
+
+ html += '/etc/config/%s%s
'.format(config, log.join('\n'));
+ n += changes[config].length;
+ }
+
+ if (n > 0)
+ $('#changes')
+ .click(function(ev) {
+ L.ui.dialog(L.tr('Staged configuration changes'), html, {
+ style: 'confirm',
+ confirm: function() {
+ L.uci.apply().then(
+ function(code) { alert('Success with code ' + code); },
+ function(code) { alert('Error with code ' + code); }
+ );
+ }
+ });
+ ev.preventDefault();
+ })
+ .children('span')
+ .show()
+ .text(L.trcp('Pending configuration changes', '1 change', '%d changes', n).format(n));
+ else
+ $('#changes').children('span').hide();
+ });
+ },
+
init: function()
{
- _luci2.ui.loading(true);
+ L.ui.loading(true);
$.when(
- _luci2.ui.renderMainMenu()
+ L.session.updateACLs(),
+ L.ui.updateHostname(),
+ L.ui.updateChanges(),
+ L.ui.renderMainMenu(),
+ L.NetworkModel.init()
).then(function() {
- _luci2.ui.renderView(_luci2.globals.defaultNode).then(function() {
- _luci2.ui.loading(false);
- })
+ L.ui.renderView(L.globals.defaultNode).then(function() {
+ L.ui.loading(false);
+ });
+
+ $(window).on('hashchange', function() {
+ L.ui.changeView();
+ });
});
+ },
+
+ button: function(label, style, title)
+ {
+ style = style || 'default';
+
+ return $('')
+ .attr('type', 'button')
+ .attr('title', title ? title : '')
+ .addClass('btn btn-' + style)
+ .text(label);
}
};
- var AbstractWidget = Class.extend({
+ this.ui.AbstractWidget = Class.extend({
i18n: function(text) {
return text;
},
- toString: function() {
- var x = document.createElement('div');
- x.appendChild(this.render());
+ label: function() {
+ var key = arguments[0];
+ var args = [ ];
+
+ for (var i = 1; i < arguments.length; i++)
+ args.push(arguments[i]);
- return x.innerHTML;
+ switch (typeof(this.options[key]))
+ {
+ case 'undefined':
+ return '';
+
+ case 'function':
+ return this.options[key].apply(this, args);
+
+ default:
+ return ''.format.apply('' + this.options[key], args);
+ }
+ },
+
+ toString: function() {
+ return $('').append(this.render()).html();
},
insertInto: function(id) {
return $(id).empty().append(this.render());
+ },
+
+ appendTo: function(id) {
+ return $(id).append(this.render());
+ },
+
+ on: function(evname, evfunc)
+ {
+ var evnames = L.toArray(evname);
+
+ if (!this.events)
+ this.events = { };
+
+ for (var i = 0; i < evnames.length; i++)
+ this.events[evnames[i]] = evfunc;
+
+ return this;
+ },
+
+ trigger: function(evname, evdata)
+ {
+ if (this.events)
+ {
+ var evnames = L.toArray(evname);
+
+ for (var i = 0; i < evnames.length; i++)
+ if (this.events[evnames[i]])
+ this.events[evnames[i]].call(this, evdata);
+ }
+
+ return this;
}
});
- this.ui.view = AbstractWidget.extend({
+ this.ui.view = this.ui.AbstractWidget.extend({
_fetch_template: function()
{
- return $.ajax(_luci2.globals.resource + '/template/' + this.options.name + '.htm', {
+ return $.ajax(L.globals.resource + '/template/' + this.options.name + '.htm', {
method: 'GET',
cache: true,
dataType: 'text',
@@ -1923,10 +3975,10 @@ function LuCI2()
return '';
case ':':
- return _luci2.tr(p2);
+ return L.tr(p2);
case '=':
- return _luci2.globals[p2] || '';
+ return L.globals[p2] || '';
default:
return '(?' + match + ')';
@@ -1953,16 +4005,58 @@ function LuCI2()
container.append($('').append(this.title));
if (this.description)
- container.append($('').addClass('cbi-map-descr').append(this.description));
+ container.append($('').append(this.description));
var self = this;
+ var args = [ ];
+
+ for (var i = 0; i < arguments.length; i++)
+ args.push(arguments[i]);
+
return this._fetch_template().then(function() {
- return _luci2.deferrable(self.execute());
+ return L.deferrable(self.execute.apply(self, args));
});
+ },
+
+ repeat: function(func, interval)
+ {
+ var self = this;
+
+ if (!self._timeouts)
+ self._timeouts = [ ];
+
+ var index = self._timeouts.length;
+
+ if (typeof(interval) != 'number')
+ interval = 5000;
+
+ var setTimer, runTimer;
+
+ setTimer = function() {
+ if (self._timeouts)
+ self._timeouts[index] = window.setTimeout(runTimer, interval);
+ };
+
+ runTimer = function() {
+ L.deferrable(func.call(self)).then(setTimer, setTimer);
+ };
+
+ runTimer();
+ },
+
+ finish: function()
+ {
+ if ($.isArray(this._timeouts))
+ {
+ for (var i = 0; i < this._timeouts.length; i++)
+ window.clearTimeout(this._timeouts[i]);
+
+ delete this._timeouts;
+ }
}
});
- this.ui.menu = AbstractWidget.extend({
+ this.ui.menu = this.ui.AbstractWidget.extend({
init: function() {
this._nodes = { };
},
@@ -2012,7 +4106,10 @@ function LuCI2()
var child = this.firstChildView(nodes[i]);
if (child)
{
- $.extend(node, child);
+ for (var key in child)
+ if (!node.hasOwnProperty(key) && child.hasOwnProperty(key))
+ node[key] = child[key];
+
return node;
}
}
@@ -2022,10 +4119,7 @@ function LuCI2()
_onclick: function(ev)
{
- _luci2.ui.loading(true);
- _luci2.ui.renderView(ev.data).then(function() {
- _luci2.ui.loading(false);
- });
+ L.setHash('view', ev.data);
ev.preventDefault();
this.blur();
@@ -2046,32 +4140,40 @@ function LuCI2()
var list = $('');
if (level == 0)
- list.addClass('nav');
+ list.addClass('nav').addClass('navbar-nav');
else if (level == 1)
- list.addClass('dropdown-menu');
+ list.addClass('dropdown-menu').addClass('navbar-inverse');
for (var i = 0; i < nodes.length; i++)
{
- if (!_luci2.globals.defaultNode)
+ if (!L.globals.defaultNode)
{
- var v = _luci2.getHash('view');
+ var v = L.getHash('view');
if (!v || v == nodes[i].view)
- _luci2.globals.defaultNode = nodes[i];
+ L.globals.defaultNode = nodes[i];
}
var item = $('')
.append($('')
.attr('href', '#')
- .text(_luci2.tr(nodes[i].title))
- .click(nodes[i], this._onclick))
+ .text(L.tr(nodes[i].title)))
.appendTo(list);
if (nodes[i].childs && level < max)
{
item.addClass('dropdown');
- item.find('a').addClass('menu');
+
+ item.find('a')
+ .addClass('dropdown-toggle')
+ .attr('data-toggle', 'dropdown')
+ .append('');
+
item.append(this._render(nodes[i].childs, level + 1));
}
+ else
+ {
+ item.find('a').click(nodes[i].view, this._onclick);
+ }
}
return list.get(0);
@@ -2079,7 +4181,7 @@ function LuCI2()
render: function(min, max)
{
- var top = min ? this.getNode(_luci2.globals.defaultNode.view, min) : this._nodes;
+ var top = min ? this.getNode(L.globals.defaultNode.view, min) : this._nodes;
return this._render(top.childs, 0, min, max);
},
@@ -2103,7 +4205,7 @@ function LuCI2()
}
});
- this.ui.table = AbstractWidget.extend({
+ this.ui.table = this.ui.AbstractWidget.extend({
init: function()
{
this._rows = [ ];
@@ -2111,11 +4213,11 @@ function LuCI2()
row: function(values)
{
- if (isa(values, 'Array'))
+ if ($.isArray(values))
{
this._rows.push(values);
}
- else if (isa(values, 'Object'))
+ else if ($.isPlainObject(values))
{
var v = [ ];
for (var i = 0; i < this.options.columns.length; i++)
@@ -2150,7 +4252,7 @@ function LuCI2()
}
var table = document.createElement('table');
- table.className = 'cbi-section-table';
+ table.className = 'table table-condensed table-hover';
var has_caption = false;
var has_description = false;
@@ -2269,38 +4371,42 @@ function LuCI2()
}
});
- this.ui.progress = AbstractWidget.extend({
+ this.ui.progress = this.ui.AbstractWidget.extend({
render: function()
{
var vn = parseInt(this.options.value) || 0;
var mn = parseInt(this.options.max) || 100;
var pc = Math.floor((100 / mn) * vn);
- var bar = document.createElement('div');
- bar.className = 'progressbar';
-
- bar.appendChild(document.createElement('div'));
- bar.lastChild.appendChild(document.createElement('div'));
- bar.lastChild.style.width = pc + '%';
+ var text;
if (typeof(this.options.format) == 'string')
- $(bar.lastChild.lastChild).append(this.options.format.format(this.options.value, this.options.max, pc));
+ text = this.options.format.format(this.options.value, this.options.max, pc);
else if (typeof(this.options.format) == 'function')
- $(bar.lastChild.lastChild).append(this.options.format(pc));
+ text = this.options.format(pc);
else
- $(bar.lastChild.lastChild).append('%.2f%%'.format(pc));
+ text = '%.2f%%'.format(pc);
- return bar;
+ return $('')
+ .addClass('progress')
+ .append($('')
+ .addClass('progress-bar')
+ .addClass('progress-bar-info')
+ .css('width', pc + '%'))
+ .append($('')
+ .text(text));
}
});
- this.ui.devicebadge = AbstractWidget.extend({
+ this.ui.devicebadge = this.ui.AbstractWidget.extend({
render: function()
{
- var dev = this.options.l3_device || this.options.device || '?';
+ var l2dev = this.options.l2_device || this.options.device;
+ var l3dev = this.options.l3_device;
+ var dev = l3dev || l2dev || '?';
var span = document.createElement('span');
- span.className = 'ifacebadge';
+ span.className = 'badge';
if (typeof(this.options.signal) == 'number' ||
typeof(this.options.noise) == 'number')
@@ -2323,46 +4429,46 @@ function LuCI2()
}
span.appendChild(document.createElement('img'));
- span.lastChild.src = _luci2.globals.resource + '/icons/signal-' + r + '.png';
+ span.lastChild.src = L.globals.resource + '/icons/signal-' + r + '.png';
if (r == 'none')
- span.title = _luci2.tr('No signal');
+ span.title = L.tr('No signal');
else
span.title = '%s: %d %s / %s: %d %s'.format(
- _luci2.tr('Signal'), this.options.signal, _luci2.tr('dBm'),
- _luci2.tr('Noise'), this.options.noise, _luci2.tr('dBm')
+ L.tr('Signal'), this.options.signal, L.tr('dBm'),
+ L.tr('Noise'), this.options.noise, L.tr('dBm')
);
}
else
{
var type = 'ethernet';
- var desc = _luci2.tr('Ethernet device');
+ var desc = L.tr('Ethernet device');
- if (this.options.l3_device != this.options.device)
+ if (l3dev != l2dev)
{
type = 'tunnel';
- desc = _luci2.tr('Tunnel interface');
+ desc = L.tr('Tunnel interface');
}
else if (dev.indexOf('br-') == 0)
{
type = 'bridge';
- desc = _luci2.tr('Bridge');
+ desc = L.tr('Bridge');
}
else if (dev.indexOf('.') > 0)
{
type = 'vlan';
- desc = _luci2.tr('VLAN interface');
+ desc = L.tr('VLAN interface');
}
else if (dev.indexOf('wlan') == 0 ||
dev.indexOf('ath') == 0 ||
dev.indexOf('wl') == 0)
{
type = 'wifi';
- desc = _luci2.tr('Wireless Network');
+ desc = L.tr('Wireless Network');
}
span.appendChild(document.createElement('img'));
- span.lastChild.src = _luci2.globals.resource + '/icons/' + type + (this.options.up ? '' : '_disabled') + '.png';
+ span.lastChild.src = L.globals.resource + '/icons/' + type + (this.options.up ? '' : '_disabled') + '.png';
span.title = desc;
}
@@ -2383,7 +4489,7 @@ function LuCI2()
validation: {
i18n: function(msg)
{
- _luci2.cbi.validation.message = _luci2.tr(msg);
+ L.cbi.validation.message = L.tr(msg);
},
compile: function(code)
@@ -2391,7 +4497,7 @@ function LuCI2()
var pos = 0;
var esc = false;
var depth = 0;
- var types = _luci2.cbi.validation.types;
+ var types = L.cbi.validation.types;
var stack = [ ];
code += ',';
@@ -2432,7 +4538,7 @@ function LuCI2()
else if (typeof types[label] == 'function')
{
stack.push(types[label]);
- stack.push(null);
+ stack.push([ ]);
}
else
{
@@ -2451,7 +4557,7 @@ function LuCI2()
throw "Syntax error, argument list follows non-function";
stack[stack.length-1] =
- arguments.callee(code.substring(pos, i));
+ L.cbi.validation.compile(code.substring(pos, i));
pos = i+1;
}
@@ -2505,8 +4611,7 @@ function LuCI2()
'ipaddr': function()
{
- if (validation.types['ip4addr'].apply(this) ||
- validation.types['ip6addr'].apply(this))
+ if (L.parseIPv4(this) || L.parseIPv6(this))
return true;
validation.i18n('Must be a valid IP address');
@@ -2515,17 +4620,8 @@ function LuCI2()
'ip4addr': function()
{
- if (this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
- {
- if ((RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
- (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
- (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
- (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
- ((RegExp.$6.indexOf('.') < 0)
- ? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))
- : (validation.types['ip4addr'].apply(RegExp.$6))))
- return true;
- }
+ if (L.parseIPv4(this))
+ return true;
validation.i18n('Must be a valid IPv4 address');
return false;
@@ -2533,61 +4629,74 @@ function LuCI2()
'ip6addr': function()
{
- if (this.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/))
- {
- if (!RegExp.$2 || ((RegExp.$3 >= 0) && (RegExp.$3 <= 128)))
- {
- var addr = RegExp.$1;
+ if (L.parseIPv6(this))
+ return true;
- if (addr == '::')
- {
- return true;
- }
+ validation.i18n('Must be a valid IPv6 address');
+ return false;
+ },
- if (addr.indexOf('.') > 0)
- {
- var off = addr.lastIndexOf(':');
+ 'netmask4': function()
+ {
+ if (L.isNetmask(L.parseIPv4(this)))
+ return true;
- if (!(off && validation.types['ip4addr'].apply(addr.substr(off+1))))
- {
- validation.i18n('Must be a valid IPv6 address');
- return false;
- }
+ validation.i18n('Must be a valid IPv4 netmask');
+ return false;
+ },
- addr = addr.substr(0, off) + ':0:0';
- }
+ 'netmask6': function()
+ {
+ if (L.isNetmask(L.parseIPv6(this)))
+ return true;
- if (addr.indexOf('::') >= 0)
- {
- var colons = 0;
- var fill = '0';
+ validation.i18n('Must be a valid IPv6 netmask6');
+ return false;
+ },
- for (var i = 1; i < (addr.length-1); i++)
- if (addr.charAt(i) == ':')
- colons++;
+ 'cidr4': function()
+ {
+ if (this.match(/^([0-9.]+)\/(\d{1,2})$/))
+ if (RegExp.$2 <= 32 && L.parseIPv4(RegExp.$1))
+ return true;
- if (colons > 7)
- {
- validation.i18n('Must be a valid IPv6 address');
- return false;
- }
+ validation.i18n('Must be a valid IPv4 prefix');
+ return false;
+ },
+
+ 'cidr6': function()
+ {
+ if (this.match(/^([a-fA-F0-9:.]+)\/(\d{1,3})$/))
+ if (RegExp.$2 <= 128 && L.parseIPv6(RegExp.$1))
+ return true;
- for (var i = 0; i < (7 - colons); i++)
- fill += ':0';
+ validation.i18n('Must be a valid IPv6 prefix');
+ return false;
+ },
- if (addr.match(/^(.*?)::(.*?)$/))
- addr = (RegExp.$1 ? RegExp.$1 + ':' : '') + fill +
- (RegExp.$2 ? ':' + RegExp.$2 : '');
- }
+ 'ipmask4': function()
+ {
+ if (this.match(/^([0-9.]+)\/([0-9.]+)$/))
+ {
+ var addr = RegExp.$1, mask = RegExp.$2;
+ if (L.parseIPv4(addr) && L.isNetmask(L.parseIPv4(mask)))
+ return true;
+ }
- if (addr.match(/^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/) != null)
- return true;
+ validation.i18n('Must be a valid IPv4 address/netmask pair');
+ return false;
+ },
- validation.i18n('Must be a valid IPv6 address');
- return false;
- }
+ 'ipmask6': function()
+ {
+ if (this.match(/^([a-fA-F0-9:.]+)\/([a-fA-F0-9:.]+)$/))
+ {
+ var addr = RegExp.$1, mask = RegExp.$2;
+ if (L.parseIPv6(addr) && L.isNetmask(L.parseIPv6(mask)))
+ return true;
}
+ validation.i18n('Must be a valid IPv6 address/netmask pair');
return false;
},
@@ -2794,7 +4903,7 @@ function LuCI2()
msgs.push(validation.message.format.apply(validation.message, arguments[i+1]));
}
- validation.message = msgs.join( _luci2.tr(' - or - '));
+ validation.message = msgs.join( L.tr(' - or - '));
return false;
},
@@ -2860,7 +4969,7 @@ function LuCI2()
};
- var AbstractValue = AbstractWidget.extend({
+ this.cbi.AbstractValue = this.ui.AbstractWidget.extend({
init: function(name, options)
{
this.name = name;
@@ -2868,7 +4977,7 @@ function LuCI2()
this.dependencies = [ ];
this.rdependency = { };
- this.options = _luci2.defaults(options, {
+ this.options = L.defaults(options, {
placeholder: '',
datatype: 'string',
optional: false,
@@ -2881,31 +4990,52 @@ function LuCI2()
return this.section.id('field', sid || '__unknown__', this.name);
},
- render: function(sid)
+ render: function(sid, condensed)
{
var i = this.instance[sid] = { };
- i.top = $('').addClass('cbi-value');
+ i.top = $('');
- if (typeof(this.options.caption) == 'string')
- $('')
- .addClass('cbi-value-title')
- .attr('for', this.id(sid))
- .text(this.options.caption)
- .appendTo(i.top);
+ if (!condensed)
+ {
+ i.top.addClass('form-group');
+
+ if (typeof(this.options.caption) == 'string')
+ $('')
+ .addClass('col-lg-2 control-label')
+ .attr('for', this.id(sid))
+ .text(this.options.caption)
+ .appendTo(i.top);
+ }
- i.widget = $('').addClass('cbi-value-field').append(this.widget(sid)).appendTo(i.top);
- i.error = $('').addClass('cbi-value-error').appendTo(i.top);
+ i.error = $('')
+ .hide()
+ .addClass('label label-danger');
+
+ i.widget = $('')
+
+ .append(this.widget(sid))
+ .append(i.error)
+ .appendTo(i.top);
+
+ if (!condensed)
+ {
+ i.widget.addClass('col-lg-5');
- if (typeof(this.options.description) == 'string')
$('')
- .addClass('cbi-value-description')
- .text(this.options.description)
+ .addClass('col-lg-5')
+ .text((typeof(this.options.description) == 'string') ? this.options.description : '')
.appendTo(i.top);
+ }
return i.top;
},
+ active: function(sid)
+ {
+ return (this.instance[sid] && !this.instance[sid].disabled);
+ },
+
ucipath: function(sid)
{
return {
@@ -2952,9 +5082,9 @@ function LuCI2()
return this.choices[i][1];
}
else if (v === true)
- return _luci2.tr('yes');
+ return L.tr('yes');
else if (v === false)
- return _luci2.tr('no');
+ return L.tr('no');
else if ($.isArray(v))
return v.join(', ');
@@ -3005,8 +5135,71 @@ function LuCI2()
return chg;
},
+ _ev_validate: function(ev)
+ {
+ var d = ev.data;
+ var rv = true;
+ var val = d.elem.val();
+ var vstack = d.vstack;
+
+ if (vstack && typeof(vstack[0]) == 'function')
+ {
+ delete validation.message;
+
+ if ((val.length == 0 && !d.opt))
+ {
+ d.elem.parents('div.form-group, td').first().addClass('luci2-form-error');
+ d.elem.parents('div.input-group, div.form-group, td').first().addClass('has-error');
+
+ d.inst.error.text(L.tr('Field must not be empty')).show();
+ rv = false;
+ }
+ else if (val.length > 0 && !vstack[0].apply(val, vstack[1]))
+ {
+ d.elem.parents('div.form-group, td').first().addClass('luci2-form-error');
+ d.elem.parents('div.input-group, div.form-group, td').first().addClass('has-error');
+
+ d.inst.error.text(validation.message.format.apply(validation.message, vstack[1])).show();
+ rv = false;
+ }
+ else
+ {
+ d.elem.parents('div.form-group, td').first().removeClass('luci2-form-error');
+ d.elem.parents('div.input-group, div.form-group, td').first().removeClass('has-error');
+
+ if (d.multi && d.inst.widget && d.inst.widget.find('input.error, select.error').length > 0)
+ rv = false;
+ else
+ d.inst.error.text('').hide();
+ }
+ }
+
+ if (rv)
+ {
+ for (var field in d.self.rdependency)
+ d.self.rdependency[field].toggle(d.sid);
+
+ d.self.section.tabtoggle(d.sid);
+ }
+
+ return rv;
+ },
+
validator: function(sid, elem, multi)
{
+ var evdata = {
+ self: this,
+ sid: sid,
+ elem: elem,
+ multi: multi,
+ inst: this.instance[sid],
+ opt: this.options.optional
+ };
+
+ if (this.events)
+ for (var evname in this.events)
+ elem.on(evname, evdata, this.events[evname]);
+
if (typeof(this.options.datatype) == 'undefined' && $.isEmptyObject(this.rdependency))
return elem;
@@ -3014,13 +5207,13 @@ function LuCI2()
if (typeof(this.options.datatype) == 'string')
{
try {
- vstack = _luci2.cbi.validation.compile(this.options.datatype);
+ evdata.vstack = L.cbi.validation.compile(this.options.datatype);
} catch(e) { };
}
else if (typeof(this.options.datatype) == 'function')
{
var vfunc = this.options.datatype;
- vstack = [ function(elem) {
+ evdata.vstack = [ function(elem) {
var rv = vfunc(this, elem);
if (rv !== true)
validation.message = rv;
@@ -3028,80 +5221,22 @@ function LuCI2()
}, [ elem ] ];
}
- var evdata = {
- self: this,
- sid: sid,
- elem: elem,
- multi: multi,
- inst: this.instance[sid],
- opt: this.options.optional
- };
-
- var validator = function(ev)
- {
- var d = ev.data;
- var rv = true;
- var val = d.elem.val();
-
- if (vstack && typeof(vstack[0]) == 'function')
- {
- delete validation.message;
-
- if ((val.length == 0 && !d.opt))
- {
- d.elem.addClass('error');
- d.inst.top.addClass('error');
- d.inst.error.text(_luci2.tr('Field must not be empty'));
- rv = false;
- }
- else if (val.length > 0 && !vstack[0].apply(val, vstack[1]))
- {
- d.elem.addClass('error');
- d.inst.top.addClass('error');
- d.inst.error.text(validation.message.format.apply(validation.message, vstack[1]));
- rv = false;
- }
- else
- {
- d.elem.removeClass('error');
-
- if (d.multi && d.inst.widget.find('input.error, select.error').length > 0)
- {
- rv = false;
- }
- else
- {
- d.inst.top.removeClass('error');
- d.inst.error.text('');
- }
- }
- }
-
- if (rv)
- {
- for (var field in d.self.rdependency)
- d.self.rdependency[field].toggle(d.sid);
- }
-
- return rv;
- };
-
if (elem.prop('tagName') == 'SELECT')
{
- elem.change(evdata, validator);
+ elem.change(evdata, this._ev_validate);
}
else if (elem.prop('tagName') == 'INPUT' && elem.attr('type') == 'checkbox')
{
- elem.click(evdata, validator);
- elem.blur(evdata, validator);
+ elem.click(evdata, this._ev_validate);
+ elem.blur(evdata, this._ev_validate);
}
else
{
- elem.keyup(evdata, validator);
- elem.blur(evdata, validator);
+ elem.keyup(evdata, this._ev_validate);
+ elem.blur(evdata, this._ev_validate);
}
- elem.attr('cbi-validate', true).on('validate', evdata, validator);
+ elem.attr('cbi-validate', true).on('validate', evdata, this._ev_validate);
return elem;
},
@@ -3115,7 +5250,7 @@ function LuCI2()
return (i.disabled || i.error.text() == '');
},
- depends: function(d, v)
+ depends: function(d, v, add)
{
var dep;
@@ -3126,11 +5261,11 @@ function LuCI2()
{
if (typeof(d[i]) == 'string')
dep[d[i]] = true;
- else if (d[i] instanceof AbstractValue)
+ else if (d[i] instanceof L.cbi.AbstractValue)
dep[d[i].name] = true;
}
}
- else if (d instanceof AbstractValue)
+ else if (d instanceof L.cbi.AbstractValue)
{
dep = { };
dep[d.name] = (typeof(v) == 'undefined') ? true : v;
@@ -3160,7 +5295,11 @@ function LuCI2()
if ($.isEmptyObject(dep))
return this;
- this.dependencies.push(dep);
+ if (!add || !this.dependencies.length)
+ this.dependencies.push(dep);
+ else
+ for (var i = 0; i < this.dependencies.length; i++)
+ $.extend(this.dependencies[i], dep);
return this;
},
@@ -3190,7 +5329,7 @@ function LuCI2()
break;
}
}
- else if (typeof(cmp) == 'string')
+ else if (typeof(cmp) == 'string' || typeof(cmp) == 'number')
{
if (val != cmp)
{
@@ -3238,7 +5377,7 @@ function LuCI2()
}
});
- this.cbi.CheckboxValue = AbstractValue.extend({
+ this.cbi.CheckboxValue = this.cbi.AbstractValue.extend({
widget: function(sid)
{
var o = this.options;
@@ -3251,7 +5390,9 @@ function LuCI2()
.attr('type', 'checkbox')
.prop('checked', this.ucivalue(sid));
- return this.validator(sid, i);
+ return $('')
+ .addClass('checkbox')
+ .append(this.validator(sid, i));
},
ucivalue: function(sid)
@@ -3291,22 +5432,21 @@ function LuCI2()
if (chg)
{
- val = val ? this.options.enabled : this.options.disabled;
-
if (this.options.optional && val == this.options.initial)
this.map.set(uci.config, uci.section, uci.option, undefined);
else
- this.map.set(uci.config, uci.section, uci.option, val);
+ this.map.set(uci.config, uci.section, uci.option, val ? this.options.enabled : this.options.disabled);
}
return chg;
}
});
- this.cbi.InputValue = AbstractValue.extend({
+ this.cbi.InputValue = this.cbi.AbstractValue.extend({
widget: function(sid)
{
var i = $('')
+ .addClass('form-control')
.attr('id', this.id(sid))
.attr('type', 'text')
.attr('placeholder', this.options.placeholder)
@@ -3316,44 +5456,47 @@ function LuCI2()
}
});
- this.cbi.PasswordValue = AbstractValue.extend({
+ this.cbi.PasswordValue = this.cbi.AbstractValue.extend({
widget: function(sid)
{
var i = $('')
+ .addClass('form-control')
.attr('id', this.id(sid))
.attr('type', 'password')
.attr('placeholder', this.options.placeholder)
.val(this.ucivalue(sid));
- var t = $('![]()
')
- .attr('src', _luci2.globals.resource + '/icons/cbi/reload.gif')
- .attr('title', _luci2.tr('Reveal or hide password'))
- .addClass('cbi-button')
- .click(function(ev) {
- var i = $(this).prev();
- var t = i.attr('type');
- i.attr('type', (t == 'password') ? 'text' : 'password');
- i = t = null;
- });
+ var t = $('')
+ .addClass('input-group-btn')
+ .append(L.ui.button(L.tr('Reveal'), 'default')
+ .click(function(ev) {
+ var b = $(this);
+ var i = b.parent().prev();
+ var t = i.attr('type');
+ b.text(t == 'password' ? L.tr('Hide') : L.tr('Reveal'));
+ i.attr('type', (t == 'password') ? 'text' : 'password');
+ b = i = t = null;
+ }));
this.validator(sid, i);
return $('')
- .addClass('cbi-input-password')
+ .addClass('input-group')
.append(i)
.append(t);
}
});
- this.cbi.ListValue = AbstractValue.extend({
+ this.cbi.ListValue = this.cbi.AbstractValue.extend({
widget: function(sid)
{
- var s = $('');
+ var s = $('')
+ .addClass('form-control');
- if (this.options.optional)
+ if (this.options.optional && !this.has_empty)
$('')
.attr('value', '')
- .text(_luci2.tr('-- Please choose --'))
+ .text(L.tr('-- Please choose --'))
.appendTo(s);
if (this.choices)
@@ -3373,6 +5516,9 @@ function LuCI2()
if (!this.choices)
this.choices = [ ];
+ if (k == '')
+ this.has_empty = true;
+
this.choices.push([k, v || k]);
return this;
}
@@ -3395,16 +5541,13 @@ function LuCI2()
for (var i = 0; i < this.choices.length; i++)
{
$('')
+ .addClass('checkbox')
.append($('')
- .addClass('cbi-input-checkbox')
.attr('type', 'checkbox')
.attr('value', this.choices[i][0])
.prop('checked', s[this.choices[i][0]]))
.append(this.choices[i][1])
.appendTo(t);
-
- $('
')
- .appendTo(t);
}
return t;
@@ -3440,7 +5583,7 @@ function LuCI2()
}
});
- this.cbi.ComboBox = AbstractValue.extend({
+ this.cbi.ComboBox = this.cbi.AbstractValue.extend({
_change: function(ev)
{
var s = ev.target;
@@ -3450,10 +5593,7 @@ function LuCI2()
{
ev.data.select.hide();
ev.data.input.show().focus();
-
- var v = ev.data.input.val();
- ev.data.input.val(' ');
- ev.data.input.val(v);
+ ev.data.input.val('');
}
else if (self.options.optional && s.selectedIndex == 0)
{
@@ -3463,6 +5603,8 @@ function LuCI2()
{
ev.data.input.val(ev.data.select.val());
}
+
+ ev.stopPropagation();
},
_blur: function(ev)
@@ -3473,10 +5615,10 @@ function LuCI2()
ev.data.select.empty();
- if (self.options.optional)
+ if (self.options.optional && !self.has_empty)
$('')
.attr('value', '')
- .text(_luci2.tr('-- please choose --'))
+ .text(L.tr('-- please choose --'))
.appendTo(ev.data.select);
if (self.choices)
@@ -3499,11 +5641,11 @@ function LuCI2()
$('')
.attr('value', ' ')
- .text(_luci2.tr('-- custom --'))
+ .text(L.tr('-- custom --'))
.appendTo(ev.data.select);
ev.data.input.hide();
- ev.data.select.val(val).show().focus();
+ ev.data.select.val(val).show().blur();
},
_enter: function(ev)
@@ -3522,17 +5664,19 @@ function LuCI2()
.attr('id', this.id(sid));
var t = $('')
+ .addClass('form-control')
.attr('type', 'text')
.hide()
.appendTo(d);
var s = $('')
+ .addClass('form-control')
.appendTo(d);
var evdata = {
self: this,
- input: this.validator(sid, t),
- select: this.validator(sid, s)
+ input: t,
+ select: s
};
s.change(evdata, this._change);
@@ -3542,6 +5686,9 @@ function LuCI2()
t.val(this.ucivalue(sid));
t.blur();
+ this.validator(sid, t);
+ this.validator(sid, s);
+
return d;
},
@@ -3550,6 +5697,9 @@ function LuCI2()
if (!this.choices)
this.choices = [ ];
+ if (k == '')
+ this.has_empty = true;
+
this.choices.push([k, v || k]);
return this;
},
@@ -3567,7 +5717,7 @@ function LuCI2()
var v = s.values || [ ];
delete s.values;
- $(s.parent).children('input').each(function(i) {
+ $(s.parent).children('div.input-group').children('input').each(function(i) {
if (i != del)
v.push(this.value || '');
});
@@ -3591,17 +5741,33 @@ function LuCI2()
sid: s.sid,
self: s.self,
parent: s.parent,
- index: i
+ index: i,
+ remove: ((i+1) < v.length)
};
+ var btn;
+ if (evdata.remove)
+ btn = L.ui.button('â', 'danger').click(evdata, this._btnclick);
+ else
+ btn = L.ui.button('+', 'success').click(evdata, this._btnclick);
+
if (this.choices)
{
var txt = $('')
+ .addClass('form-control')
.attr('type', 'text')
- .hide()
- .appendTo(s.parent);
+ .hide();
var sel = $('')
+ .addClass('form-control');
+
+ $('')
+ .addClass('input-group')
+ .append(txt)
+ .append(sel)
+ .append($('')
+ .addClass('input-group-btn')
+ .append(btn))
.appendTo(s.parent);
evdata.input = this.validator(s.sid, txt, true);
@@ -3625,12 +5791,18 @@ function LuCI2()
.attr('type', 'text')
.attr('index', i)
.attr('placeholder', (i == 0) ? this.options.placeholder : '')
- .addClass('cbi-input-text')
+ .addClass('form-control')
.keydown(evdata, this._keydown)
.keypress(evdata, this._keypress)
.val(v[i]);
- f.appendTo(s.parent);
+ $('')
+ .addClass('input-group')
+ .append(f)
+ .append($('')
+ .addClass('input-group-btn')
+ .append(btn))
+ .appendTo(s.parent);
if (i == focus)
{
@@ -3651,16 +5823,6 @@ function LuCI2()
f = null;
}
- $('![]()
')
- .attr('src', _luci2.globals.resource + ((i+1) < v.length ? '/icons/cbi/remove.gif' : '/icons/cbi/add.gif'))
- .attr('title', (i+1) < v.length ? _luci2.tr('Remove entry') : _luci2.tr('Add entry'))
- .addClass('cbi-button')
- .click(evdata, this._btnclick)
- .appendTo(s.parent);
-
- $('
')
- .appendTo(s.parent);
-
evdata = null;
}
@@ -3725,7 +5887,7 @@ function LuCI2()
/* arrow up */
case 38:
- var prev = input.prevAll('input:first');
+ var prev = input.parent().prevAll('div.input-group:first').children('input');
if (prev.is(':visible'))
prev.focus();
else
@@ -3734,7 +5896,7 @@ function LuCI2()
/* arrow down */
case 40:
- var next = input.nextAll('input:first');
+ var next = input.parent().nextAll('div.input-group:first').children('input');
if (next.is(':visible'))
next.focus();
else
@@ -3749,7 +5911,7 @@ function LuCI2()
{
if (!this.getAttribute('disabled'))
{
- if (ev.target.src.indexOf('remove') > -1)
+ if (ev.data.remove)
{
var index = ev.data.index;
ev.data.self._redraw(-index, -1, index, ev.data);
@@ -3799,7 +5961,7 @@ function LuCI2()
formvalue: function(sid)
{
var rv = [ ];
- var fields = $('#' + this.id(sid) + ' > input');
+ var fields = $('#' + this.id(sid) + ' input');
for (var i = 0; i < fields.length; i++)
if (typeof(fields[i].value) == 'string' && fields[i].value.length)
@@ -3809,11 +5971,11 @@ function LuCI2()
}
});
- this.cbi.DummyValue = AbstractValue.extend({
+ this.cbi.DummyValue = this.cbi.AbstractValue.extend({
widget: function(sid)
{
return $('')
- .addClass('cbi-value-dummy')
+ .addClass('form-control-static')
.attr('id', this.id(sid))
.html(this.ucivalue(sid));
},
@@ -3824,52 +5986,32 @@ function LuCI2()
}
});
- this.cbi.NetworkList = AbstractValue.extend({
- load: function(sid)
+ this.cbi.ButtonValue = this.cbi.AbstractValue.extend({
+ widget: function(sid)
{
- var self = this;
+ this.options.optional = true;
- if (!self.interfaces)
- {
- self.interfaces = [ ];
- return _luci2.network.getNetworkStatus(function(ifaces) {
- self.interfaces = ifaces;
- self = null;
- });
- }
+ var btn = $('')
+ .addClass('btn btn-default')
+ .attr('id', this.id(sid))
+ .attr('type', 'button')
+ .text(this.label('text'));
- return undefined;
+ return this.validator(sid, btn);
+ }
+ });
+
+ this.cbi.NetworkList = this.cbi.AbstractValue.extend({
+ load: function(sid)
+ {
+ return L.NetworkModel.init();
},
_device_icon: function(dev)
{
- var type = 'ethernet';
- var desc = _luci2.tr('Ethernet device');
-
- if (dev.type == 'IP tunnel')
- {
- type = 'tunnel';
- desc = _luci2.tr('Tunnel interface');
- }
- else if (dev['bridge-members'])
- {
- type = 'bridge';
- desc = _luci2.tr('Bridge');
- }
- else if (dev.wireless)
- {
- type = 'wifi';
- desc = _luci2.tr('Wireless Network');
- }
- else if (dev.name.indexOf('.') > 0)
- {
- type = 'vlan';
- desc = _luci2.tr('VLAN interface');
- }
-
return $('![]()
')
- .attr('src', _luci2.globals.resource + '/icons/' + type + (dev.up ? '' : '_disabled') + '.png')
- .attr('title', '%s (%s)'.format(desc, dev.name));
+ .attr('src', dev.icon())
+ .attr('title', '%s (%s)'.format(dev.description(), dev.name() || '?'));
},
widget: function(sid)
@@ -3877,7 +6019,7 @@ function LuCI2()
var id = this.id(sid);
var ul = $('')
.attr('id', id)
- .addClass('cbi-input-networks');
+ .addClass('list-unstyled');
var itype = this.options.multiple ? 'checkbox' : 'radio';
var value = this.ucivalue(sid);
@@ -3889,47 +6031,35 @@ function LuCI2()
for (var i = 0; i < value.length; i++)
check[value[i]] = true;
- if (this.interfaces)
+ var interfaces = L.NetworkModel.getInterfaces();
+
+ for (var i = 0; i < interfaces.length; i++)
{
- for (var i = 0; i < this.interfaces.length; i++)
- {
- var iface = this.interfaces[i];
- var badge = $('')
- .addClass('ifacebadge')
- .text('%s: '.format(iface.name));
-
- if (iface.subdevices)
- for (var j = 0; j < iface.subdevices.length; j++)
- badge.append(this._device_icon(iface.subdevices[j]));
- else if (iface.device)
- badge.append(this._device_icon(iface.device));
- else
- badge.append($('').text(_luci2.tr('(No devices attached)')));
+ var iface = interfaces[i];
- $('')
- .append($('')
- .append($('')
- .attr('name', itype + id)
- .attr('type', itype)
- .attr('value', iface.name)
- .prop('checked', !!check[iface.name])
- .addClass('cbi-input-' + itype))
- .append(badge))
- .appendTo(ul);
- }
+ $('')
+ .append($('')
+ .addClass(itype + ' inline')
+ .append(this.validator(sid, $('')
+ .attr('name', itype + id)
+ .attr('type', itype)
+ .attr('value', iface.name())
+ .prop('checked', !!check[iface.name()]), true))
+ .append(iface.renderBadge()))
+ .appendTo(ul);
}
if (!this.options.multiple)
{
$('')
.append($('')
+ .addClass(itype + ' inline text-muted')
.append($('')
.attr('name', itype + id)
.attr('type', itype)
.attr('value', '')
- .prop('checked', !value)
- .addClass('cbi-input-' + itype))
- .append(_luci2.tr('unspecified')))
+ .prop('checked', $.isEmptyObject(check)))
+ .append(L.tr('unspecified')))
.appendTo(ul);
}
@@ -3986,8 +6116,170 @@ function LuCI2()
}
});
+ this.cbi.DeviceList = this.cbi.NetworkList.extend({
+ _ev_focus: function(ev)
+ {
+ var self = ev.data.self;
+ var input = $(this);
+
+ input.parent().prev().prop('checked', true);
+ },
+
+ _ev_blur: function(ev)
+ {
+ ev.which = 10;
+ ev.data.self._ev_keydown.call(this, ev);
+ },
+
+ _ev_keydown: function(ev)
+ {
+ if (ev.which != 10 && ev.which != 13)
+ return;
+
+ var sid = ev.data.sid;
+ var self = ev.data.self;
+ var input = $(this);
+ var ifnames = L.toArray(input.val());
+
+ if (!ifnames.length)
+ return;
+
+ L.NetworkModel.createDevice(ifnames[0]);
+
+ self._redraw(sid, $('#' + self.id(sid)), ifnames[0]);
+ },
+
+ load: function(sid)
+ {
+ return L.NetworkModel.init();
+ },
+
+ _redraw: function(sid, ul, sel)
+ {
+ var id = ul.attr('id');
+ var devs = L.NetworkModel.getDevices();
+ var iface = L.NetworkModel.getInterface(sid);
+ var itype = this.options.multiple ? 'checkbox' : 'radio';
+ var check = { };
+
+ if (!sel)
+ {
+ for (var i = 0; i < devs.length; i++)
+ if (devs[i].isInNetwork(iface))
+ check[devs[i].name()] = true;
+ }
+ else
+ {
+ if (this.options.multiple)
+ check = L.toObject(this.formvalue(sid));
+
+ check[sel] = true;
+ }
+
+ ul.empty();
+
+ for (var i = 0; i < devs.length; i++)
+ {
+ var dev = devs[i];
+
+ if (dev.isBridge() && this.options.bridges === false)
+ continue;
+
+ if (!dev.isBridgeable() && this.options.multiple)
+ continue;
+
+ var badge = $('')
+ .addClass('badge')
+ .append($('![]()
').attr('src', dev.icon()))
+ .append(' %s: %s'.format(dev.name(), dev.description()));
+
+ //var ifcs = dev.getInterfaces();
+ //if (ifcs.length)
+ //{
+ // for (var j = 0; j < ifcs.length; j++)
+ // badge.append((j ? ', ' : ' (') + ifcs[j].name());
+ //
+ // badge.append(')');
+ //}
+
+ $('')
+ .append($('')
+ .addClass(itype + ' inline')
+ .append($('')
+ .attr('name', itype + id)
+ .attr('type', itype)
+ .attr('value', dev.name())
+ .prop('checked', !!check[dev.name()]))
+ .append(badge))
+ .appendTo(ul);
+ }
+
+
+ $('')
+ .append($('')
+ .attr('for', 'custom' + id)
+ .addClass(itype + ' inline')
+ .append($('')
+ .attr('name', itype + id)
+ .attr('type', itype)
+ .attr('value', ''))
+ .append($('')
+ .addClass('badge')
+ .append($('')
+ .attr('id', 'custom' + id)
+ .attr('type', 'text')
+ .attr('placeholder', L.tr('Custom device â¦'))
+ .on('focus', { self: this, sid: sid }, this._ev_focus)
+ .on('blur', { self: this, sid: sid }, this._ev_blur)
+ .on('keydown', { self: this, sid: sid }, this._ev_keydown))))
+ .appendTo(ul);
+
+ if (!this.options.multiple)
+ {
+ $('')
+ .append($('')
+ .addClass(itype + ' inline text-muted')
+ .append($('')
+ .attr('name', itype + id)
+ .attr('type', itype)
+ .attr('value', '')
+ .prop('checked', $.isEmptyObject(check)))
+ .append(L.tr('unspecified')))
+ .appendTo(ul);
+ }
+ },
+
+ widget: function(sid)
+ {
+ var id = this.id(sid);
+ var ul = $('')
+ .attr('id', id)
+ .addClass('list-unstyled');
+
+ this._redraw(sid, ul);
+
+ return ul;
+ },
+
+ save: function(sid)
+ {
+ if (this.instance[sid].disabled)
+ return;
+
+ var ifnames = this.formvalue(sid);
+ //if (!ifnames)
+ // return;
+
+ var iface = L.NetworkModel.getInterface(sid);
+ if (!iface)
+ return;
+
+ iface.setDevices($.isArray(ifnames) ? ifnames : [ ifnames ]);
+ }
+ });
+
- var AbstractSection = AbstractWidget.extend({
+ this.cbi.AbstractSection = this.ui.AbstractWidget.extend({
id: function()
{
var s = [ arguments[0], this.map.uci_package, this.uci_type ];
@@ -4037,7 +6329,7 @@ function LuCI2()
var w = widget ? new widget(name, options) : null;
- if (!(w instanceof AbstractValue))
+ if (!(w instanceof L.cbi.AbstractValue))
throw 'Widget must be an instance of AbstractValue';
w.section = this;
@@ -4046,7 +6338,31 @@ function LuCI2()
this.fields[name] = w;
tab.fields.push(w);
- return w;
+ return w;
+ },
+
+ tabtoggle: function(sid)
+ {
+ for (var i = 0; i < this.tabs.length; i++)
+ {
+ var tab = this.tabs[i];
+ var elem = $('#' + this.id('nodetab', sid, tab.id));
+ var empty = true;
+
+ for (var j = 0; j < tab.fields.length; j++)
+ {
+ if (tab.fields[j].active(sid))
+ {
+ empty = false;
+ break;
+ }
+ }
+
+ if (empty && elem.is(':visible'))
+ elem.fadeOut();
+ else if (!empty)
+ elem.fadeIn();
+ }
},
ucipackages: function(pkg)
@@ -4076,64 +6392,69 @@ function LuCI2()
return rv;
},
- validate: function(sid)
+ validate_section: function(sid)
{
- var rv = true;
-
- if (!sid)
- {
- var as = this.sections();
- for (var i = 0; i < as.length; i++)
- if (!this.validate(as[i]['.name']))
- rv = false;
- return rv;
- }
-
var inst = this.instance[sid];
- var sv = rv[sid] || (rv[sid] = { });
var invals = 0;
- var legend = $('#' + this.id('sort', sid)).find('legend:first');
-
- legend.children('span').detach();
+ var badge = $('#' + this.id('teaser', sid)).children('span:first');
for (var i = 0; i < this.tabs.length; i++)
{
var inval = 0;
- var tab = $('#' + this.id('tabhead', sid, this.tabs[i].id));
-
- tab.children('span').detach();
+ var stbadge = $('#' + this.id('nodetab', sid, this.tabs[i].id)).children('span:first');
for (var j = 0; j < this.tabs[i].fields.length; j++)
if (!this.tabs[i].fields[j].validate(sid))
inval++;
if (inval > 0)
- {
- $('')
- .addClass('badge')
- .attr('title', _luci2.tr('%d Errors'.format(inval)))
+ stbadge.show()
.text(inval)
- .appendTo(tab);
+ .attr('title', L.trp('1 Error', '%d Errors', inval).format(inval));
+ else
+ stbadge.hide();
- invals += inval;
- tab = null;
- rv = false;
- }
+ invals += inval;
}
if (invals > 0)
- $('')
- .addClass('badge')
- .attr('title', _luci2.tr('%d Errors'.format(invals)))
+ badge.show()
.text(invals)
- .appendTo(legend);
+ .attr('title', L.trp('1 Error', '%d Errors', invals).format(invals));
+ else
+ badge.hide();
- return rv;
+ return invals;
+ },
+
+ validate: function()
+ {
+ var errors = 0;
+ var as = this.sections();
+
+ for (var i = 0; i < as.length; i++)
+ {
+ var invals = this.validate_section(as[i]['.name']);
+
+ if (invals > 0)
+ errors += invals;
+ }
+
+ var badge = $('#' + this.id('sectiontab')).children('span:first');
+
+ if (errors > 0)
+ badge.show()
+ .text(errors)
+ .attr('title', L.trp('1 Error', '%d Errors', errors).format(errors));
+ else
+ badge.hide();
+
+ return (errors == 0);
}
});
- this.cbi.TypedSection = AbstractSection.extend({
+ this.cbi.TypedSection = this.cbi.AbstractSection.extend({
init: function(uci_type, options)
{
this.uci_type = uci_type;
@@ -4151,7 +6472,7 @@ function LuCI2()
sections: function(cb)
{
- var s1 = this.map.ucisections(this.map.uci_package);
+ var s1 = L.uci.sections(this.map.uci_package);
var s2 = [ ];
for (var i = 0; i < s1.length; i++)
@@ -4161,22 +6482,22 @@ function LuCI2()
if (typeof(cb) == 'function')
for (var i = 0; i < s2.length; i++)
- cb.apply(this, [ s2[i] ]);
+ cb.call(this, s2[i]);
return s2;
},
add: function(name)
{
- this.map.add(this.map.uci_package, this.uci_type, name);
+ return this.map.add(this.map.uci_package, this.uci_type, name);
},
remove: function(sid)
{
- this.map.remove(this.map.uci_package, sid);
+ return this.map.remove(this.map.uci_package, sid);
},
- _add: function(ev)
+ _ev_add: function(ev)
{
var addb = $(this);
var name = undefined;
@@ -4188,58 +6509,59 @@ function LuCI2()
if (addb.prop('disabled') || name === '')
return;
+ L.ui.saveScrollTop();
+
self.active_panel = -1;
self.map.save();
- self.add(name);
+
+ ev.data.sid = self.add(name);
+ ev.data.type = self.uci_type;
+ ev.data.name = name;
+
+ self.trigger('add', ev);
+
self.map.redraw();
+
+ L.ui.restoreScrollTop();
},
- _remove: function(ev)
+ _ev_remove: function(ev)
{
var self = ev.data.self;
var sid = ev.data.sid;
+ L.ui.saveScrollTop();
+
+ self.trigger('remove', ev);
+
self.map.save();
self.remove(sid);
self.map.redraw();
+ L.ui.restoreScrollTop();
+
ev.stopPropagation();
},
- _sid: function(ev)
+ _ev_sid: function(ev)
{
var self = ev.data.self;
var text = $(this);
var addb = text.next();
var errt = addb.next();
var name = text.val();
- var used = false;
if (!/^[a-zA-Z0-9_]*$/.test(name))
{
- errt.text(_luci2.tr('Invalid section name')).show();
+ errt.text(L.tr('Invalid section name')).show();
text.addClass('error');
addb.prop('disabled', true);
return false;
}
- for (var sid in self.map.uci.values[self.map.uci_package])
- if (sid == name)
- {
- used = true;
- break;
- }
-
- for (var sid in self.map.uci.creates[self.map.uci_package])
- if (sid == name)
- {
- used = true;
- break;
- }
-
- if (used)
+ if (L.uci.get(self.map.uci_package, name))
{
- errt.text(_luci2.tr('Name already used')).show();
+ errt.text(L.tr('Name already used')).show();
text.addClass('error');
addb.prop('disabled', true);
return false;
@@ -4251,6 +6573,70 @@ function LuCI2()
return true;
},
+ _ev_tab: function(ev)
+ {
+ var self = ev.data.self;
+ var sid = ev.data.sid;
+
+ self.validate();
+ self.active_tab[sid] = parseInt(ev.target.getAttribute('data-luci2-tab-index'));
+ },
+
+ _ev_panel_collapse: function(ev)
+ {
+ var self = ev.data.self;
+
+ var this_panel = $(ev.target);
+ var this_toggle = this_panel.prevAll('[data-toggle="collapse"]:first');
+
+ var prev_toggle = $($(ev.delegateTarget).find('[data-toggle="collapse"]:eq(%d)'.format(self.active_panel)));
+ var prev_panel = $(prev_toggle.attr('data-target'));
+
+ prev_panel
+ .removeClass('in')
+ .addClass('collapse');
+
+ prev_toggle.find('.luci2-section-teaser')
+ .show()
+ .children('span:last')
+ .empty()
+ .append(self.teaser(prev_panel.attr('data-luci2-sid')));
+
+ this_toggle.find('.luci2-section-teaser')
+ .hide();
+
+ self.active_panel = parseInt(this_panel.attr('data-luci2-panel-index'));
+ self.validate();
+ },
+
+ _ev_panel_open: function(ev)
+ {
+ var self = ev.data.self;
+ var panel = $($(this).attr('data-target'));
+ var index = parseInt(panel.attr('data-luci2-panel-index'));
+
+ if (index == self.active_panel)
+ ev.stopPropagation();
+ },
+
+ _ev_sort: function(ev)
+ {
+ var self = ev.data.self;
+ var cur_idx = ev.data.index;
+ var new_idx = cur_idx + (ev.data.up ? -1 : 1);
+ var s = self.sections();
+
+ if (new_idx >= 0 && new_idx < s.length)
+ {
+ L.uci.swap(self.map.uci_package, s[cur_idx]['.name'], s[new_idx]['.name']);
+
+ self.map.save();
+ self.map.redraw();
+ }
+
+ ev.stopPropagation();
+ },
+
teaser: function(sid)
{
var tf = this.teaser_fields;
@@ -4264,9 +6650,9 @@ function LuCI2()
for (var i = 0; i < this.options.teasers.length; i++)
{
var f = this.options.teasers[i];
- if (f instanceof AbstractValue)
+ if (f instanceof L.cbi.AbstractValue)
tf.push(f);
- else if (typeof(f) == 'string' && this.fields[f] instanceof AbstractValue)
+ else if (typeof(f) == 'string' && this.fields[f] instanceof L.cbi.AbstractValue)
tf.push(this.fields[f]);
}
}
@@ -4299,15 +6685,18 @@ function LuCI2()
_render_add: function()
{
- var text = _luci2.tr('Add section');
- var ttip = _luci2.tr('Create new section...');
+ if (!this.options.addremove)
+ return null;
+
+ var text = L.tr('Add section');
+ var ttip = L.tr('Create new section...');
if ($.isArray(this.options.add_caption))
text = this.options.add_caption[0], ttip = this.options.add_caption[1];
else if (typeof(this.options.add_caption) == 'string')
text = this.options.add_caption, ttip = '';
- var add = $('').addClass('cbi-section-add');
+ var add = $('');
if (this.options.anonymous === false)
{
@@ -4315,15 +6704,15 @@ function LuCI2()
.addClass('cbi-input-text')
.attr('type', 'text')
.attr('placeholder', ttip)
- .blur({ self: this }, this._sid)
- .keyup({ self: this }, this._sid)
+ .blur({ self: this }, this._ev_sid)
+ .keyup({ self: this }, this._ev_sid)
.appendTo(add);
$('![]()
')
- .attr('src', _luci2.globals.resource + '/icons/cbi/add.gif')
+ .attr('src', L.globals.resource + '/icons/cbi/add.gif')
.attr('title', text)
.addClass('cbi-button')
- .click({ self: this }, this._add)
+ .click({ self: this }, this._ev_add)
.appendTo(add);
$('')
@@ -4333,250 +6722,260 @@ function LuCI2()
}
else
{
- $('')
- .attr('type', 'button')
- .addClass('cbi-button')
- .addClass('cbi-button-add')
- .val(text).attr('title', ttip)
- .click({ self: this }, this._add)
- .appendTo(add)
+ L.ui.button(text, 'success', ttip)
+ .click({ self: this }, this._ev_add)
+ .appendTo(add);
}
return add;
},
- _render_remove: function(sid)
+ _render_remove: function(sid, index)
{
- var text = _luci2.tr('Remove');
- var ttip = _luci2.tr('Remove this section');
+ if (!this.options.addremove)
+ return null;
+
+ var text = L.tr('Remove');
+ var ttip = L.tr('Remove this section');
if ($.isArray(this.options.remove_caption))
text = this.options.remove_caption[0], ttip = this.options.remove_caption[1];
else if (typeof(this.options.remove_caption) == 'string')
text = this.options.remove_caption, ttip = '';
- return $('')
- .attr('type', 'button')
- .addClass('cbi-button')
- .addClass('cbi-button-remove')
- .val(text).attr('title', ttip)
- .click({ self: this, sid: sid }, this._remove);
+ return L.ui.button(text, 'danger', ttip)
+ .click({ self: this, sid: sid, index: index }, this._ev_remove);
},
- _render_caption: function(sid)
+ _render_sort: function(sid, index)
{
- if (typeof(this.options.caption) == 'string')
- {
- return $('')
- .text(this.options.caption.format(sid));
- }
- else if (typeof(this.options.caption) == 'function')
- {
- return $('')
- .text(this.options.caption.call(this, sid));
- }
+ if (!this.options.sortable)
+ return null;
+
+ var b1 = L.ui.button('â', 'info', L.tr('Move up'))
+ .click({ self: this, index: index, up: true }, this._ev_sort);
- return '';
+ var b2 = L.ui.button('â', 'info', L.tr('Move down'))
+ .click({ self: this, index: index, up: false }, this._ev_sort);
+
+ return b1.add(b2);
},
- render: function()
+ _render_caption: function()
{
- var allsections = $();
- var panel_index = 0;
+ return $('')
+ .addClass('panel-title')
+ .append(this.label('caption') || this.uci_type);
+ },
- this.instance = { };
+ _render_description: function()
+ {
+ var text = this.label('description');
- var s = this.sections();
+ if (text)
+ return $('')
+ .addClass('luci2-section-description')
+ .text(text);
- if (s.length == 0)
+ return null;
+ },
+
+ _render_teaser: function(sid, index)
+ {
+ if (this.options.collabsible || this.map.options.collabsible)
{
- var fieldset = $('')
- .addClass('cbi-section');
+ return $('')
+ .attr('id', this.id('teaser', sid))
+ .addClass('luci2-section-teaser well well-sm')
+ .append($('')
+ .addClass('badge'))
+ .append($(''));
+ }
- var head = $('')
- .addClass('cbi-section-head')
- .appendTo(fieldset);
+ return null;
+ },
- head.append(this._render_caption(undefined));
+ _render_head: function(condensed)
+ {
+ if (condensed)
+ return null;
- if (typeof(this.options.description) == 'string')
- {
- $('')
- .addClass('cbi-section-descr')
- .text(this.options.description)
- .appendTo(head);
- }
+ return $('')
+ .addClass('panel-heading')
+ .append(this._render_caption())
+ .append(this._render_description());
+ },
- allsections = allsections.add(fieldset);
- }
+ _render_tab_description: function(sid, index, tab_index)
+ {
+ var tab = this.tabs[tab_index];
- for (var i = 0; i < s.length; i++)
+ if (typeof(tab.description) == 'string')
{
- var sid = s[i]['.name'];
- var inst = this.instance[sid] = { tabs: [ ] };
+ return $('')
+ .addClass('cbi-tab-descr')
+ .text(tab.description);
+ }
- var fieldset = $('')
- .attr('id', this.id('sort', sid))
- .addClass('cbi-section');
+ return null;
+ },
- var head = $('')
- .addClass('cbi-section-head')
- .attr('cbi-section-num', this.index)
- .attr('cbi-section-id', sid);
+ _render_tab_head: function(sid, index, tab_index)
+ {
+ var tab = this.tabs[tab_index];
+ var cur = this.active_tab[sid] || 0;
- head.append(this._render_caption(sid));
+ var tabh = $('')
+ .append($('')
+ .attr('id', this.id('nodetab', sid, tab.id))
+ .attr('href', '#' + this.id('node', sid, tab.id))
+ .attr('data-toggle', 'tab')
+ .attr('data-luci2-tab-index', tab_index)
+ .text((tab.caption ? tab.caption.format(tab.id) : tab.id) + ' ')
+ .append($('')
+ .addClass('badge'))
+ .on('shown.bs.tab', { self: this, sid: sid }, this._ev_tab));
- if (typeof(this.options.description) == 'string')
- {
- $('')
- .addClass('cbi-section-descr')
- .text(this.options.description)
- .appendTo(head);
- }
+ if (cur == tab_index)
+ tabh.addClass('active');
- var teaser;
- if ((s.length > 1 && this.options.collabsible) || this.map.options.collabsible)
- teaser = $('')
- .addClass('cbi-section-teaser')
- .appendTo(head);
+ if (!tab.fields.length)
+ tabh.hide();
- if (this.options.addremove)
- $('')
- .addClass('cbi-section-remove')
- .addClass('right')
- .append(this._render_remove(sid))
- .appendTo(head);
+ return tabh;
+ },
- var body = $('')
- .attr('index', panel_index++);
+ _render_tab_body: function(sid, index, tab_index)
+ {
+ var tab = this.tabs[tab_index];
+ var cur = this.active_tab[sid] || 0;
- var fields = $('')
- .addClass('cbi-section-node');
+ var tabb = $('')
+ .addClass('tab-pane')
+ .attr('id', this.id('node', sid, tab.id))
+ .attr('data-luci2-tab-index', tab_index)
+ .append(this._render_tab_description(sid, index, tab_index));
- if (this.tabs.length > 1)
- {
- var menu = $('')
- .addClass('cbi-tabmenu');
+ if (cur == tab_index)
+ tabb.addClass('active');
- for (var j = 0; j < this.tabs.length; j++)
- {
- var tabid = this.id('tab', sid, this.tabs[j].id);
- var theadid = this.id('tabhead', sid, this.tabs[j].id);
+ for (var i = 0; i < tab.fields.length; i++)
+ tabb.append(tab.fields[i].render(sid));
- var tabc = $('')
- .addClass('cbi-tabcontainer')
- .attr('id', tabid)
- .attr('index', j);
+ return tabb;
+ },
- if (typeof(this.tabs[j].description) == 'string')
- {
- $('')
- .addClass('cbi-tab-descr')
- .text(this.tabs[j].description)
- .appendTo(tabc);
- }
+ _render_section_head: function(sid, index)
+ {
+ var head = $('')
+ .addClass('luci2-section-header')
+ .append(this._render_teaser(sid, index))
+ .append($('')
+ .addClass('btn-group')
+ .append(this._render_sort(sid, index))
+ .append(this._render_remove(sid, index)));
- for (var k = 0; k < this.tabs[j].fields.length; k++)
- this.tabs[j].fields[k].render(sid).appendTo(tabc);
+ if (this.options.collabsible)
+ {
+ head.attr('data-toggle', 'collapse')
+ .attr('data-parent', this.id('sectiongroup'))
+ .attr('data-target', '#' + this.id('panel', sid))
+ .on('click', { self: this }, this._ev_panel_open);
+ }
- tabc.appendTo(fields);
- tabc = null;
+ return head;
+ },
- $('').attr('id', theadid).append(
- $('')
- .text(this.tabs[j].caption.format(this.tabs[j].id))
- .attr('href', '#' + tabid)
- ).appendTo(menu);
- }
+ _render_section_body: function(sid, index)
+ {
+ var body = $('')
+ .attr('id', this.id('panel', sid))
+ .attr('data-luci2-panel-index', index)
+ .attr('data-luci2-sid', sid);
- menu.appendTo(body);
- menu = null;
+ if (this.options.collabsible || this.map.options.collabsible)
+ {
+ body.addClass('panel-collapse collapse');
- fields.appendTo(body);
- fields = null;
+ if (index == this.active_panel)
+ body.addClass('in');
+ }
- var t = body.tabs({ active: this.active_tab[sid] });
+ var tab_heads = $('')
+ .addClass('nav nav-tabs');
- t.on('tabsactivate', { self: this, sid: sid }, function(ev, ui) {
- var d = ev.data;
- d.self.validate();
- d.self.active_tab[d.sid] = parseInt(ui.newPanel.attr('index'));
- });
- }
- else
- {
- for (var j = 0; j < this.tabs[0].fields.length; j++)
- this.tabs[0].fields[j].render(sid).appendTo(fields);
+ var tab_bodies = $('')
+ .addClass('form-horizontal tab-content')
+ .append(tab_heads);
- fields.appendTo(body);
- fields = null;
- }
+ for (var j = 0; j < this.tabs.length; j++)
+ {
+ tab_heads.append(this._render_tab_head(sid, index, j));
+ tab_bodies.append(this._render_tab_body(sid, index, j));
+ }
- head.appendTo(fieldset);
- head = null;
+ body.append(tab_bodies);
- body.appendTo(fieldset);
- body = null;
+ if (this.tabs.length <= 1)
+ tab_heads.hide();
- allsections = allsections.add(fieldset);
- fieldset = null;
+ return body;
+ },
- //this.validate(sid);
- //
- //if (teaser)
- // teaser.append(this.teaser(sid));
- }
+ _render_body: function(condensed)
+ {
+ var s = this.sections();
- if (this.options.collabsible && s.length > 1)
- {
- var a = $('').append(allsections).accordion({
- header: '> fieldset > div.cbi-section-head',
- heightStyle: 'content',
- active: this.active_panel
- });
+ if (this.active_panel < 0)
+ this.active_panel += s.length;
+ else if (this.active_panel >= s.length)
+ this.active_panel = s.length - 1;
- a.on('accordionbeforeactivate', { self: this }, function(ev, ui) {
- var h = ui.oldHeader;
- var s = ev.data.self;
- var i = h.attr('cbi-section-id');
+ var body = $('')
+ .addClass('list-group');
- h.children('.cbi-section-teaser').empty().append(s.teaser(i));
- s.validate();
- });
+ if (this.options.collabsible)
+ {
+ body.attr('id', this.id('sectiongroup'))
+ .on('show.bs.collapse', { self: this }, this._ev_panel_collapse);
+ }
- a.on('accordionactivate', { self: this }, function(ev, ui) {
- ev.data.self.active_panel = parseInt(ui.newPanel.attr('index'));
- });
+ if (s.length == 0)
+ {
+ body.append($('')
+ .addClass('list-group-item text-muted')
+ .text(this.label('placeholder') || L.tr('There are no entries defined yet.')))
+ }
- if (this.options.sortable)
- {
- var s = a.sortable({
- axis: 'y',
- handle: 'div.cbi-section-head'
- });
+ for (var i = 0; i < s.length; i++)
+ {
+ var sid = s[i]['.name'];
+ var inst = this.instance[sid] = { tabs: [ ] };
- s.on('sortupdate', { self: this, ids: s.sortable('toArray') }, function(ev, ui) {
- var sections = [ ];
- for (var i = 0; i < ev.data.ids.length; i++)
- sections.push(ev.data.ids[i].substring(ev.data.ids[i].lastIndexOf('.') + 1));
- _luci2.uci.order(ev.data.self.map.uci_package, sections);
- });
+ body.append($('')
+ .addClass('list-group-item')
+ .append(this._render_section_head(sid, i))
+ .append(this._render_section_body(sid, i)));
+ }
- s.on('sortstop', function(ev, ui) {
- ui.item.children('div.cbi-section-head').triggerHandler('focusout');
- });
- }
+ return body;
+ },
- if (this.options.addremove)
- this._render_add().appendTo(a);
+ render: function(condensed)
+ {
+ this.instance = { };
- return a;
- }
+ var panel = $('')
+ .addClass('panel panel-default')
+ .append(this._render_head(condensed))
+ .append(this._render_body(condensed));
if (this.options.addremove)
- allsections = allsections.add(this._render_add());
+ panel.append($('')
+ .addClass('panel-footer')
+ .append(this._render_add()));
- return allsections;
+ return panel;
},
finish: function()
@@ -4587,146 +6986,101 @@ function LuCI2()
{
var sid = s[i]['.name'];
- this.validate(sid);
+ this.validate_section(sid);
- $('#' + this.id('sort', sid))
- .children('.cbi-section-head')
- .children('.cbi-section-teaser')
- .append(this.teaser(sid));
+ if (i != this.active_panel)
+ $('#' + this.id('teaser', sid)).children('span:last')
+ .append(this.teaser(sid));
+ else
+ $('#' + this.id('teaser', sid))
+ .hide();
}
}
});
this.cbi.TableSection = this.cbi.TypedSection.extend({
- render: function()
+ _render_table_head: function()
{
- var allsections = $();
- var panel_index = 0;
-
- this.instance = { };
-
- var s = this.sections();
-
- var fieldset = $('')
- .addClass('cbi-section');
-
- fieldset.append(this._render_caption(sid));
-
- if (typeof(this.options.description) == 'string')
- {
- $('')
- .addClass('cbi-section-descr')
- .text(this.options.description)
- .appendTo(fieldset);
- }
-
- var fields = $('')
- .addClass('cbi-section-node')
- .appendTo(fieldset);
-
- var table = $('')
- .addClass('cbi-section-table')
- .appendTo(fields);
-
var thead = $('')
- .append($('|
').addClass('cbi-section-table-titles'))
- .appendTo(table);
+ .append($('|
')
+ .addClass('cbi-section-table-titles'));
for (var j = 0; j < this.tabs[0].fields.length; j++)
- $(' | ')
+ thead.children().append($(' | ')
.addClass('cbi-section-table-cell')
.css('width', this.tabs[0].fields[j].options.width || '')
- .append(this.tabs[0].fields[j].options.caption)
- .appendTo(thead.children());
+ .append(this.tabs[0].fields[j].label('caption')));
- if (this.options.sortable)
- $(' | ').addClass('cbi-section-table-cell').text(' ').appendTo(thead.children());
+ if (this.options.addremove !== false || this.options.sortable)
+ thead.children().append($(' | ')
+ .addClass('cbi-section-table-cell')
+ .text(' '));
- if (this.options.addremove !== false)
- $(' | ').addClass('cbi-section-table-cell').text(' ').appendTo(thead.children());
+ return thead;
+ },
- var tbody = $('')
- .appendTo(table);
+ _render_table_row: function(sid, index)
+ {
+ var row = $('|
')
+ .attr('data-luci2-sid', sid);
- if (s.length == 0)
+ for (var j = 0; j < this.tabs[0].fields.length; j++)
{
- $('|
')
- .addClass('cbi-section-table-row')
- .append(
- $(' | ')
- .addClass('cbi-section-table-cell')
- .addClass('cbi-section-table-placeholder')
- .attr('colspan', thead.children().children().length)
- .text(this.options.placeholder || _luci2.tr('This section contains no values yet')))
- .appendTo(tbody);
+ row.append($(' | ')
+ .css('width', this.tabs[0].fields[j].options.width || '')
+ .append(this.tabs[0].fields[j].render(sid, true)));
}
- for (var i = 0; i < s.length; i++)
+ if (this.options.addremove !== false || this.options.sortable)
{
- var sid = s[i]['.name'];
- var inst = this.instance[sid] = { tabs: [ ] };
+ row.append($(' | ')
+ .addClass('text-right')
+ .append($('')
+ .addClass('btn-group')
+ .append(this._render_sort(sid, index))
+ .append(this._render_remove(sid, index))));
+ }
- var row = $('|
')
- .addClass('cbi-section-table-row')
- .appendTo(tbody);
+ return row;
+ },
- for (var j = 0; j < this.tabs[0].fields.length; j++)
- {
- $(' | ')
- .addClass('cbi-section-table-cell')
- .css('width', this.tabs[0].fields[j].options.width || '')
- .append(this.tabs[0].fields[j].render(sid, true))
- .appendTo(row);
- }
+ _render_table_body: function()
+ {
+ var s = this.sections();
- if (this.options.sortable)
- {
- $(' | ')
- .addClass('cbi-section-table-cell')
- .addClass('cbi-section-table-sort')
- .append($('![]()
').attr('src', _luci2.globals.resource + '/icons/cbi/up.gif').attr('title', _luci2.tr('Drag to sort')))
- .append($('
'))
- .append($('![]()
').attr('src', _luci2.globals.resource + '/icons/cbi/down.gif').attr('title', _luci2.tr('Drag to sort')))
- .appendTo(row);
- }
+ var tbody = $('');
- if (this.options.addremove !== false)
- {
- $(' | ')
- .addClass('cbi-section-table-cell')
- .append(this._render_remove(sid))
- .appendTo(row);
- }
+ if (s.length == 0)
+ {
+ var cols = this.tabs[0].fields.length;
- this.validate(sid);
+ if (this.options.addremove !== false || this.options.sortable)
+ cols++;
- row = null;
+ tbody.append($('|
')
+ .append($(' | ')
+ .addClass('text-muted')
+ .attr('colspan', cols)
+ .text(this.label('placeholder') || L.tr('There are no entries defined yet.'))));
}
- if (this.options.sortable)
+ for (var i = 0; i < s.length; i++)
{
- var s = tbody.sortable({
- handle: 'td.cbi-section-table-sort'
- });
-
- s.on('sortupdate', { self: this, ids: s.sortable('toArray') }, function(ev, ui) {
- var sections = [ ];
- for (var i = 0; i < ev.data.ids.length; i++)
- sections.push(ev.data.ids[i].substring(ev.data.ids[i].lastIndexOf('.') + 1));
- _luci2.uci.order(ev.data.self.map.uci_package, sections);
- });
+ var sid = s[i]['.name'];
+ var inst = this.instance[sid] = { tabs: [ ] };
- s.on('sortstop', function(ev, ui) {
- ui.item.children('div.cbi-section-head').triggerHandler('focusout');
- });
+ tbody.append(this._render_table_row(sid, i));
}
- if (this.options.addremove)
- this._render_add().appendTo(fieldset);
-
- fields = table = thead = tbody = null;
+ return tbody;
+ },
- return fieldset;
+ _render_body: function(condensed)
+ {
+ return $('')
+ .addClass('table table-condensed table-hover')
+ .append(this._render_table_head())
+ .append(this._render_table_body());
}
});
@@ -4734,22 +7088,32 @@ function LuCI2()
sections: function(cb)
{
var sa = [ ];
- var pkg = this.map.uci.values[this.map.uci_package];
+ var sl = L.uci.sections(this.map.uci_package);
- for (var s in pkg)
- if (pkg[s]['.name'] == this.uci_type)
+ for (var i = 0; i < sl.length; i++)
+ if (sl[i]['.name'] == this.uci_type)
{
- sa.push(pkg[s]);
+ sa.push(sl[i]);
break;
}
if (typeof(cb) == 'function' && sa.length > 0)
- cb.apply(this, [ sa[0] ]);
+ cb.call(this, sa[0]);
return sa;
}
});
+ this.cbi.SingleSection = this.cbi.NamedSection.extend({
+ render: function()
+ {
+ this.instance = { };
+ this.instance[this.uci_type] = { tabs: [ ] };
+
+ return this._render_section_body(this.uci_type, 0);
+ }
+ });
+
this.cbi.DummySection = this.cbi.TypedSection.extend({
sections: function(cb)
{
@@ -4760,35 +7124,46 @@ function LuCI2()
}
});
- this.cbi.Map = AbstractWidget.extend({
+ this.cbi.Map = this.ui.AbstractWidget.extend({
init: function(uci_package, options)
{
var self = this;
this.uci_package = uci_package;
this.sections = [ ];
- this.options = _luci2.defaults(options, {
+ this.options = L.defaults(options, {
save: function() { },
- prepare: function() {
- return _luci2.uci.writable(function(writable) {
- self.options.readonly = !writable;
- });
- }
+ prepare: function() { }
});
},
+ _load_cb: function()
+ {
+ var deferreds = [ L.deferrable(this.options.prepare()) ];
+
+ for (var i = 0; i < this.sections.length; i++)
+ {
+ for (var f in this.sections[i].fields)
+ {
+ if (typeof(this.sections[i].fields[f].load) != 'function')
+ continue;
+
+ var s = this.sections[i].sections();
+ for (var j = 0; j < s.length; j++)
+ {
+ var rv = this.sections[i].fields[f].load(s[j]['.name']);
+ if (L.isDeferred(rv))
+ deferreds.push(rv);
+ }
+ }
+ }
+
+ return $.when.apply($, deferreds);
+ },
+
load: function()
{
- this.uci = {
- newid: 0,
- values: { },
- creates: { },
- changes: { },
- deletes: { }
- };
-
- this.active_panel = 0;
-
+ var self = this;
var packages = { };
for (var i = 0; i < this.sections.length; i++)
@@ -4796,126 +7171,155 @@ function LuCI2()
packages[this.uci_package] = true;
- for (var p in packages)
- packages[p] = ['uci', 'get', { config: p }];
+ for (var pkg in packages)
+ if (!L.uci.writable(pkg))
+ this.options.readonly = true;
- var load_cb = this._load_cb || (this._load_cb = $.proxy(function(responses) {
- for (var p in responses)
- {
- if (responses[p][0] != 0 || !responses[p][1] || !responses[p][1].values)
- continue;
+ return L.uci.load(L.toArray(packages)).then(function() {
+ return self._load_cb();
+ });
+ },
- this.uci.values[p] = responses[p][1].values;
- }
+ _ev_tab: function(ev)
+ {
+ var self = ev.data.self;
- var deferreds = [ _luci2.deferrable(this.options.prepare()) ];
+ self.validate();
+ self.active_tab = parseInt(ev.target.getAttribute('data-luci2-tab-index'));
+ },
- for (var i = 0; i < this.sections.length; i++)
- {
- for (var f in this.sections[i].fields)
- {
- if (typeof(this.sections[i].fields[f].load) != 'function')
- continue;
+ _ev_apply: function(ev)
+ {
+ var self = ev.data.self;
- var s = this.sections[i].sections();
- for (var j = 0; j < s.length; j++)
- {
- var rv = this.sections[i].fields[f].load(s[j]['.name']);
- if (_luci2.deferred(rv))
- deferreds.push(rv);
- }
- }
- }
+ self.trigger('apply', ev);
+ },
- return $.when.apply($, deferreds);
- }, this));
+ _ev_save: function(ev)
+ {
+ var self = ev.data.self;
- return _luci2.rpc.call(packages).then(load_cb);
+ self.send().then(function() {
+ self.trigger('save', ev);
+ });
},
- render: function()
+ _ev_reset: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.trigger('reset', ev);
+ self.reset();
+ },
+
+ _render_tab_head: function(tab_index)
{
- var map = $('').addClass('cbi-map');
+ var section = this.sections[tab_index];
+ var cur = this.active_tab || 0;
- if (typeof(this.options.caption) == 'string')
- $('').text(this.options.caption).appendTo(map);
+ var tabh = $('')
+ .append($('')
+ .attr('id', section.id('sectiontab'))
+ .attr('href', '#' + section.id('section'))
+ .attr('data-toggle', 'tab')
+ .attr('data-luci2-tab-index', tab_index)
+ .text(section.label('caption') + ' ')
+ .append($('')
+ .addClass('badge'))
+ .on('shown.bs.tab', { self: this }, this._ev_tab));
- if (typeof(this.options.description) == 'string')
- $('').addClass('cbi-map-descr').text(this.options.description).appendTo(map);
+ if (cur == tab_index)
+ tabh.addClass('active');
- var sections = $('').appendTo(map);
+ return tabh;
+ },
- for (var i = 0; i < this.sections.length; i++)
- {
- var s = this.sections[i].render();
+ _render_tab_body: function(tab_index)
+ {
+ var section = this.sections[tab_index];
+ var desc = section.label('description');
+ var cur = this.active_tab || 0;
- if (this.options.readonly || this.sections[i].options.readonly)
- s.find('input, select, button, img.cbi-button').attr('disabled', true);
+ var tabb = $('')
+ .addClass('tab-pane')
+ .attr('id', section.id('section'))
+ .attr('data-luci2-tab-index', tab_index);
- s.appendTo(sections);
+ if (cur == tab_index)
+ tabb.addClass('active');
- if (this.sections[i].options.active)
- this.active_panel = i;
- }
+ if (desc)
+ tabb.append($('')
+ .text(desc));
- if (this.options.collabsible)
- {
- var a = sections.accordion({
- header: '> fieldset > div.cbi-section-head',
- heightStyle: 'content',
- active: this.active_panel
- });
+ var s = section.render(this.options.tabbed);
- a.on('accordionbeforeactivate', { self: this }, function(ev, ui) {
- var h = ui.oldHeader;
- var s = ev.data.self.sections[parseInt(h.attr('cbi-section-num'))];
- var i = h.attr('cbi-section-id');
+ if (this.options.readonly || section.options.readonly)
+ s.find('input, select, button, img.cbi-button').attr('disabled', true);
- h.children('.cbi-section-teaser').empty().append(s.teaser(i));
+ tabb.append(s);
- for (var i = 0; i < ev.data.self.sections.length; i++)
- ev.data.self.sections[i].validate();
- });
+ return tabb;
+ },
- a.on('accordionactivate', { self: this }, function(ev, ui) {
- ev.data.self.active_panel = parseInt(ui.newPanel.attr('index'));
- });
- }
+ _render_body: function()
+ {
+ var tabs = $('')
+ .addClass('nav nav-tabs');
- if (this.options.pageaction !== false)
+ var body = $('')
+ .append(tabs);
+
+ for (var i = 0; i < this.sections.length; i++)
{
- var a = $('')
- .addClass('cbi-page-actions')
- .appendTo(map);
+ tabs.append(this._render_tab_head(i));
+ body.append(this._render_tab_body(i));
+ }
- $('')
- .addClass('cbi-button').addClass('cbi-button-apply')
- .attr('type', 'button')
- .val(_luci2.tr('Save & Apply'))
- .appendTo(a);
+ if (this.options.tabbed)
+ body.addClass('tab-content');
+ else
+ tabs.hide();
- $('')
- .addClass('cbi-button').addClass('cbi-button-save')
- .attr('type', 'button')
- .val(_luci2.tr('Save'))
- .click({ self: this }, function(ev) { ev.data.self.send(); })
- .appendTo(a);
+ return body;
+ },
- $('')
- .addClass('cbi-button').addClass('cbi-button-reset')
- .attr('type', 'button')
- .val(_luci2.tr('Reset'))
- .click({ self: this }, function(ev) { ev.data.self.insertInto(ev.data.self.target); })
- .appendTo(a);
+ _render_footer: function()
+ {
+ var evdata = {
+ self: this
+ };
- a = null;
- }
+ return $('')
+ .addClass('panel panel-default panel-body text-right')
+ .append($('')
+ .addClass('btn-group')
+ .append(L.ui.button(L.tr('Save & Apply'), 'primary')
+ .click(evdata, this._ev_apply))
+ .append(L.ui.button(L.tr('Save'), 'default')
+ .click(evdata, this._ev_save))
+ .append(L.ui.button(L.tr('Reset'), 'default')
+ .click(evdata, this._ev_reset)));
+ },
+
+ render: function()
+ {
+ var map = $('');
+
+ if (typeof(this.options.caption) == 'string')
+ map.append($('')
+ .text(this.options.caption));
+
+ if (typeof(this.options.description) == 'string')
+ map.append($('')
+ .text(this.options.description));
- var top = $('').append(map);
+ map.append(this._render_body());
- map = null;
+ if (this.options.pageaction !== false)
+ map.append(this._render_footer());
- return top;
+ return map;
},
finish: function()
@@ -4937,7 +7341,7 @@ function LuCI2()
{
var w = widget ? new widget(uci_type, options) : null;
- if (!(w instanceof AbstractSection))
+ if (!(w instanceof L.cbi.AbstractSection))
throw 'Widget must be an instance of AbstractSection';
w.map = this;
@@ -4966,160 +7370,22 @@ function LuCI2()
add: function(conf, type, name)
{
- var c = this.uci.creates;
- var s = '.new.%d'.format(this.uci.newid++);
-
- if (!c[conf])
- c[conf] = { };
-
- c[conf][s] = {
- '.type': type,
- '.name': s,
- '.create': name,
- '.anonymous': !name
- };
-
- return s;
+ return L.uci.add(conf, type, name);
},
remove: function(conf, sid)
{
- var n = this.uci.creates;
- var c = this.uci.changes;
- var d = this.uci.deletes;
-
- /* requested deletion of a just created section */
- if (sid.indexOf('.new.') == 0)
- {
- if (n[conf])
- delete n[conf][sid];
- }
- else
- {
- if (c[conf])
- delete c[conf][sid];
-
- if (!d[conf])
- d[conf] = { };
-
- d[conf][sid] = true;
- }
- },
-
- ucisections: function(conf, cb)
- {
- var sa = [ ];
- var pkg = this.uci.values[conf];
- var crt = this.uci.creates[conf];
- var del = this.uci.deletes[conf];
-
- if (!pkg)
- return sa;
-
- for (var s in pkg)
- if (!del || del[s] !== true)
- sa.push(pkg[s]);
-
- sa.sort(function(a, b) { return a['.index'] - b['.index'] });
-
- if (crt)
- for (var s in crt)
- sa.push(crt[s]);
-
- if (typeof(cb) == 'function')
- for (var i = 0; i < sa.length; i++)
- cb.apply(this, [ sa[i] ]);
-
- return sa;
+ return L.uci.remove(conf, sid);
},
get: function(conf, sid, opt)
{
- var v = this.uci.values;
- var n = this.uci.creates;
- var c = this.uci.changes;
- var d = this.uci.deletes;
-
- /* requested option in a just created section */
- if (sid.indexOf('.new.') == 0)
- {
- if (!n[conf])
- return undefined;
-
- if (typeof(opt) == 'undefined')
- return (n[conf][sid] || { });
-
- return n[conf][sid][opt];
- }
-
- /* requested an option value */
- if (typeof(opt) != 'undefined')
- {
- /* check whether option was deleted */
- if (d[conf] && d[conf][sid])
- {
- if (d[conf][sid] === true)
- return undefined;
-
- for (var i = 0; i < d[conf][sid].length; i++)
- if (d[conf][sid][i] == opt)
- return undefined;
- }
-
- /* check whether option was changed */
- if (c[conf] && c[conf][sid] && typeof(c[conf][sid][opt]) != 'undefined')
- return c[conf][sid][opt];
-
- /* return base value */
- if (v[conf] && v[conf][sid])
- return v[conf][sid][opt];
-
- return undefined;
- }
-
- /* requested an entire section */
- if (v[conf])
- return (v[conf][sid] || { });
-
- return undefined;
+ return L.uci.get(conf, sid, opt);
},
set: function(conf, sid, opt, val)
{
- var n = this.uci.creates;
- var c = this.uci.changes;
- var d = this.uci.deletes;
-
- if (sid.indexOf('.new.') == 0)
- {
- if (n[conf] && n[conf][sid])
- {
- if (typeof(val) != 'undefined')
- n[conf][sid][opt] = val;
- else
- delete n[conf][sid][opt];
- }
- }
- else if (typeof(val) != 'undefined')
- {
- if (!c[conf])
- c[conf] = { };
-
- if (!c[conf][sid])
- c[conf][sid] = { };
-
- c[conf][sid][opt] = val;
- }
- else
- {
- if (!d[conf])
- d[conf] = { };
-
- if (!d[conf][sid])
- d[conf][sid] = [ ];
-
- d[conf][sid].push(opt);
- }
+ return L.uci.set(conf, sid, opt, val);
},
validate: function()
@@ -5127,134 +7393,92 @@ function LuCI2()
var rv = true;
for (var i = 0; i < this.sections.length; i++)
+ {
if (!this.sections[i].validate())
rv = false;
+ }
return rv;
},
save: function()
{
- if (this.options.readonly)
- return _luci2.deferrable();
+ var self = this;
- var deferreds = [ _luci2.deferrable(this.options.save()) ];
+ if (self.options.readonly)
+ return L.deferrable();
- for (var i = 0; i < this.sections.length; i++)
+ var deferreds = [ ];
+
+ for (var i = 0; i < self.sections.length; i++)
{
- if (this.sections[i].options.readonly)
+ if (self.sections[i].options.readonly)
continue;
- for (var f in this.sections[i].fields)
+ for (var f in self.sections[i].fields)
{
- if (typeof(this.sections[i].fields[f].save) != 'function')
+ if (typeof(self.sections[i].fields[f].save) != 'function')
continue;
- var s = this.sections[i].sections();
+ var s = self.sections[i].sections();
for (var j = 0; j < s.length; j++)
{
- var rv = this.sections[i].fields[f].save(s[j]['.name']);
- if (_luci2.deferred(rv))
+ var rv = self.sections[i].fields[f].save(s[j]['.name']);
+ if (L.isDeferred(rv))
deferreds.push(rv);
}
}
}
- return $.when.apply($, deferreds);
+ return $.when.apply($, deferreds).then(function() {
+ return L.deferrable(self.options.save());
+ });
},
send: function()
{
if (!this.validate())
- return _luci2.deferrable();
-
- var send_cb = this._send_cb || (this._send_cb = $.proxy(function() {
- var requests = [ ];
-
- if (this.uci.creates)
- for (var c in this.uci.creates)
- for (var s in this.uci.creates[c])
- {
- var r = {
- config: c,
- values: { }
- };
-
- for (var k in this.uci.creates[c][s])
- {
- if (k == '.type')
- r.type = this.uci.creates[i][k];
- else if (k == '.create')
- r.name = this.uci.creates[i][k];
- else if (k.charAt(0) != '.')
- r.values[k] = this.uci.creates[i][k];
- }
- requests.push(['uci', 'add', r]);
- }
-
- if (this.uci.changes)
- for (var c in this.uci.changes)
- for (var s in this.uci.changes[c])
- requests.push(['uci', 'set', {
- config: c,
- section: s,
- values: this.uci.changes[c][s]
- }]);
-
- if (this.uci.deletes)
- for (var c in this.uci.deletes)
- for (var s in this.uci.deletes[c])
- {
- var o = this.uci.deletes[c][s];
- requests.push(['uci', 'delete', {
- config: c,
- section: s,
- options: (o === true) ? undefined : o
- }]);
- }
-
- return _luci2.rpc.call(requests);
- }, this));
+ return L.deferrable();
var self = this;
- _luci2.ui.loading(true);
+ L.ui.saveScrollTop();
+ L.ui.loading(true);
- return this.save().then(send_cb).then(function() {
+ return this.save().then(function() {
+ return L.uci.save();
+ }).then(function() {
+ return L.ui.updateChanges();
+ }).then(function() {
return self.load();
}).then(function() {
self.redraw();
self = null;
- _luci2.ui.loading(false);
+ L.ui.loading(false);
+ L.ui.restoreScrollTop();
});
},
- dialog: function(id)
+ revert: function()
{
- var d = $('');
- var p = $('');
+ var packages = { };
+
+ for (var i = 0; i < this.sections.length; i++)
+ this.sections[i].ucipackages(packages);
+
+ packages[this.uci_package] = true;
- $('![]()
')
- .attr('src', _luci2.globals.resource + '/icons/loading.gif')
- .css('vertical-align', 'middle')
- .css('padding-right', '10px')
- .appendTo(p);
+ L.uci.unload(L.toArray(packages));
+ },
- p.append(_luci2.tr('Loading data...'));
+ reset: function()
+ {
+ var self = this;
- p.appendTo(d);
- d.appendTo(id);
+ self.revert();
- return d.dialog({
- modal: true,
- draggable: false,
- resizable: false,
- height: 90,
- open: function() {
- $(this).parent().children('.ui-dialog-titlebar').hide();
- }
- });
+ return self.insertInto(self.target);
},
insertInto: function(id)
@@ -5262,7 +7486,7 @@ function LuCI2()
var self = this;
self.target = $(id);
- _luci2.ui.loading(true);
+ L.ui.loading(true);
self.target.hide();
return self.load().then(function() {
@@ -5270,8 +7494,94 @@ function LuCI2()
self.finish();
self.target.show();
self = null;
- _luci2.ui.loading(false);
+ L.ui.loading(false);
+ });
+ }
+ });
+
+ this.cbi.Modal = this.cbi.Map.extend({
+ _ev_apply: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.trigger('apply', ev);
+ },
+
+ _ev_save: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.send().then(function() {
+ self.trigger('save', ev);
+ self.close();
+ });
+ },
+
+ _ev_reset: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.trigger('close', ev);
+ self.revert();
+ self.close();
+ },
+
+ _render_footer: function()
+ {
+ var evdata = {
+ self: this
+ };
+
+ return $('')
+ .addClass('btn-group')
+ .append(L.ui.button(L.tr('Save & Apply'), 'primary')
+ .click(evdata, this._ev_apply))
+ .append(L.ui.button(L.tr('Save'), 'default')
+ .click(evdata, this._ev_save))
+ .append(L.ui.button(L.tr('Cancel'), 'default')
+ .click(evdata, this._ev_reset));
+ },
+
+ render: function()
+ {
+ var modal = L.ui.dialog(this.label('caption'), null, { wide: true });
+ var map = $('');
+
+ var desc = this.label('description');
+ if (desc)
+ map.append($('').text(desc));
+
+ map.append(this._render_body());
+
+ modal.find('.modal-body').append(map);
+ modal.find('.modal-footer').append(this._render_footer());
+
+ return modal;
+ },
+
+ redraw: function()
+ {
+ this.render();
+ this.finish();
+ },
+
+ show: function()
+ {
+ var self = this;
+
+ L.ui.loading(true);
+
+ return self.load().then(function() {
+ self.render();
+ self.finish();
+
+ L.ui.loading(false);
});
+ },
+
+ close: function()
+ {
+ L.ui.dialog(false);
}
});
};