/*
LuCI2 - OpenWrt Web Interface
- Copyright 2013 Jo-Philipp Wich <jow@openwrt.org>
+ Copyright 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
function LuCI2()
{
- var _luci2 = this;
+ var L = this;
var Class = function() { };
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;
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;
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)
return n;
};
+ this.toColor = function(str)
+ {
+ if (typeof(str) != 'string' || str.length == 0)
+ return '#CCCCCC';
+
+ if (str == 'wan')
+ return '#F09090';
+ else if (str == 'lan')
+ return '#90F090';
+
+ var i = 0, hash = 0;
+
+ while (i < str.length)
+ hash = str.charCodeAt(i++) + ((hash << 5) - hash);
+
+ 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;
+
+ var num = [ ];
+ var parts = str.split(/\./);
+
+ for (var i = 0; i < parts.length; i++)
+ {
+ var n = parseInt(parts[i], 10);
+ if (isNaN(n) || n > 255)
+ return undefined;
+
+ 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;
+
+ var lnum = [ ];
+ if (parts[0].length > 0)
+ {
+ var left = parts[0].split(/:/);
+ for (var i = 0; i < left.length; i++)
+ {
+ var n = parseInt(left[i], 16);
+ if (isNaN(n))
+ return undefined;
+
+ lnum.push((n / 256) >> 0);
+ lnum.push(n % 256);
+ }
+ }
+
+ var rnum = [ ];
+ if (parts.length > 1 && parts[1].length > 0)
+ {
+ var right = parts[1].split(/:/);
+
+ for (var i = 0; i < right.length; i++)
+ {
+ if (right[i].indexOf('.') > 0)
+ {
+ var addr = L.parseIPv4(right[i]);
+ if (!addr)
+ return undefined;
+
+ rnum.push.apply(rnum, addr);
+ continue;
+ }
+
+ var n = parseInt(right[i], 16);
+ if (isNaN(n))
+ return undefined;
+
+ 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.isNetmask = function(addr)
+ {
+ if (!$.isArray(addr))
+ return false;
+
+ var c;
+
+ for (c = 0; (c < addr.length) && (addr[c] == 255); c++);
+
+ if (c == addr.length)
+ return true;
+
+ 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;
+ }
+
+ return false;
+ };
+
this.globals = {
timeout: 15000,
resource: '/luci2',
data: JSON.stringify(req),
dataType: 'json',
type: 'POST',
- timeout: _luci2.globals.timeout,
+ timeout: L.globals.timeout,
_rpc_req: req
}).then(cb, cb);
},
for (var i = 0; i < msg.length; i++)
{
/* fetch related request info */
- var req = _luci2.rpc._requests[reqs[i].id];
+ var req = L.rpc._requests[reqs[i].id];
if (typeof(req) != 'object')
throw 'No related request for JSON response';
{
req.priv[0] = ret;
req.priv[1] = req.params;
- ret = req.filter.apply(_luci2.rpc, req.priv);
+ ret = req.filter.apply(L.rpc, req.priv);
}
/* store response data */
data = ret;
/* delete request object */
- delete _luci2.rpc._requests[reqs[i].id];
+ delete L.rpc._requests[reqs[i].id];
}
return $.Deferred().resolveWith(this, [ data ]);
flush: function()
{
if (!$.isArray(this._batch))
- return _luci2.deferrable([ ]);
+ return L.deferrable([ ]);
var req = this._batch;
delete this._batch;
id: _rpc._id++,
method: 'call',
params: [
- _luci2.globals.sid,
+ L.globals.sid,
options.object,
options.method,
params
if ($.isArray(_rpc._batch))
{
req.index = _rpc._batch.push(msg) - 1;
- return _luci2.deferrable(msg);
+ return L.deferrable(msg);
}
/* call rpc */
init: function()
{
this.state = {
- newid: 0,
+ newidx: 0,
values: { },
creates: { },
changes: { },
};
},
- _load: _luci2.rpc.declare({
+ callLoad: L.rpc.declare({
object: 'uci',
method: 'get',
params: [ 'config' ],
expect: { values: { } }
}),
- _order: _luci2.rpc.declare({
+ callOrder: L.rpc.declare({
object: 'uci',
method: 'order',
params: [ 'config', 'sections' ]
}),
- _add: _luci2.rpc.declare({
+ callAdd: L.rpc.declare({
object: 'uci',
method: 'add',
params: [ 'config', 'type', 'name', 'values' ],
expect: { section: '' }
}),
- _set: _luci2.rpc.declare({
+ callSet: L.rpc.declare({
object: 'uci',
method: 'set',
params: [ 'config', 'section', 'values' ]
}),
- _delete: _luci2.rpc.declare({
+ callDelete: L.rpc.declare({
object: 'uci',
method: 'delete',
params: [ 'config', 'section', 'options' ]
}),
+ callApply: L.rpc.declare({
+ object: 'uci',
+ method: 'apply',
+ params: [ 'timeout', 'rollback' ]
+ }),
+
+ callConfirm: L.rpc.declare({
+ object: 'uci',
+ method: 'confirm'
+ }),
+
+ createSID: function(conf)
+ {
+ var v = this.state.values;
+ var n = this.state.creates;
+ var sid;
+
+ do {
+ sid = "new%06x".format(Math.random() * 0xFFFFFF);
+ } while ((n[conf] && n[conf][sid]) || (v[conf] && v[conf][sid]));
+
+ return sid;
+ },
+
+ reorderSections: function()
+ {
+ 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)
+ {
+ 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.callOrder(c, sids);
+ }
+ }
+
+ this.state.reorder = { };
+ return L.rpc.flush();
+ },
+
load: function(packages)
{
var self = this;
if (!$.isArray(packages))
packages = [ packages ];
- _luci2.rpc.batch();
+ L.rpc.batch();
for (var i = 0; i < packages.length; i++)
- if (!seen[packages[i]])
+ if (!seen[packages[i]] && !self.state.values[packages[i]])
{
pkgs.push(packages[i]);
seen[packages[i]] = true;
- self._load(packages[i]);
+ self.callLoad(packages[i]);
}
- return _luci2.rpc.flush().then(function(responses) {
+ return L.rpc.flush().then(function(responses) {
for (var i = 0; i < responses.length; i++)
self.state.values[pkgs[i]] = responses[i];
add: function(conf, type, name)
{
- var c = this.state.creates;
- var s = '.new.%d'.format(this.state.newid++);
+ var n = this.state.creates;
+ var sid = this.createSID(conf);
- if (!c[conf])
- c[conf] = { };
+ if (!n[conf])
+ n[conf] = { };
- c[conf][s] = {
+ n[conf][sid] = {
'.type': type,
- '.name': s,
+ '.name': sid,
'.create': name,
'.anonymous': !name,
- '.index': 1000 + this.state.newid
+ '.index': 1000 + this.state.newidx++
};
- return s;
+ return sid;
},
remove: function(conf, sid)
var d = this.state.deletes;
/* requested deletion of a just created section */
- if (sid.indexOf('.new.') == 0)
+ if (n[conf] && n[conf][sid])
{
- if (n[conf])
- delete n[conf][sid];
+ delete n[conf][sid];
}
else
{
return undefined;
/* requested option in a just created section */
- if (sid.indexOf('.new.') == 0)
+ if (n[conf] && n[conf][sid])
{
if (!n[conf])
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;
opt.charAt(0) == '.')
return;
- if (sid.indexOf('.new.') == 0)
+ if (n[conf] && n[conf][sid])
{
- if (n[conf] && n[conf][sid])
- {
- if (typeof(val) != 'undefined')
- n[conf][sid][opt] = val;
- else
- delete n[conf][sid][opt];
- }
+ if (typeof(val) != 'undefined')
+ n[conf][sid][opt] = val;
+ else
+ delete n[conf][sid][opt];
}
else if (typeof(val) != 'undefined')
{
if (d[conf] && d[conf][sid] === true)
return;
+ /* only set in existing sections */
+ if (!v[conf] || !v[conf][sid])
+ return;
+
if (!c[conf])
c[conf] = { };
/* undelete option */
if (d[conf] && d[conf][sid])
- d[conf][sid] = _luci2.filterArray(d[conf][sid], opt);
+ d[conf][sid] = L.filterArray(d[conf][sid], opt);
c[conf][sid][opt] = val;
}
else
{
+ /* only delete in existing sections */
+ if (!v[conf] || !v[conf][sid])
+ return;
+
if (!d[conf])
d[conf] = { };
return this.set(conf, sid, opt, undefined);
},
- _reload: function()
+ get_first: function(conf, type, opt)
{
- var pkgs = [ ];
-
- for (var pkg in this.state.values)
- pkgs.push(pkg);
+ var sid = undefined;
- this.init();
+ L.uci.sections(conf, type, function(s) {
+ if (typeof(sid) != 'string')
+ sid = s['.name'];
+ });
- return this.load(pkgs);
+ return this.get(conf, sid, opt);
},
- _reorder: function()
+ set_first: function(conf, type, opt, val)
{
- var v = this.state.values;
- var n = this.state.creates;
- var r = this.state.reorder;
-
- if ($.isEmptyObject(r))
- return _luci2.deferrable();
-
- _luci2.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)
- {
- var o = [ ];
-
- if (n && 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 = [ ];
+ var sid = undefined;
- for (var i = 0; i < o.length; i++)
- sids.push(o[i]['.name']);
+ L.uci.sections(conf, type, function(s) {
+ if (typeof(sid) != 'string')
+ sid = s['.name'];
+ });
- this._order(c, sids);
- }
- }
+ return this.set(conf, sid, opt, val);
+ },
- this.state.reorder = { };
- return _luci2.rpc.flush();
+ unset_first: function(conf, type, opt)
+ {
+ return this.set_first(conf, type, opt, undefined);
},
swap: function(conf, sid1, sid2)
save: function()
{
- _luci2.rpc.batch();
+ 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 (self.state.creates)
- for (var c in self.state.creates)
- for (var s in self.state.creates[c])
+ if (n)
+ for (var conf in n)
+ {
+ for (var sid in n[conf])
{
var r = {
- config: c,
+ config: conf,
values: { }
};
- for (var k in self.state.creates[c][s])
+ for (var k in n[conf][sid])
{
if (k == '.type')
- r.type = self.state.creates[c][s][k];
+ r.type = n[conf][sid][k];
else if (k == '.create')
- r.name = self.state.creates[c][s][k];
+ r.name = n[conf][sid][k];
else if (k.charAt(0) != '.')
- r.values[k] = self.state.creates[c][s][k];
+ r.values[k] = n[conf][sid][k];
}
- snew.push(self.state.creates[c][s]);
+ snew.push(n[conf][sid]);
- self._add(r.config, r.type, r.name, r.values);
+ self.callAdd(r.config, r.type, r.name, r.values);
}
- if (self.state.changes)
- for (var c in self.state.changes)
- for (var s in self.state.changes[c])
- self._set(c, s, self.state.changes[c][s]);
+ pkgs[conf] = true;
+ }
+
+ if (c)
+ for (var conf in c)
+ {
+ for (var sid in c[conf])
+ self.callSet(conf, sid, c[conf][sid]);
+
+ pkgs[conf] = true;
+ }
- if (self.state.deletes)
- for (var c in self.state.deletes)
- for (var s in self.state.deletes[c])
+ if (d)
+ for (var conf in d)
+ {
+ for (var sid in d[conf])
{
- var o = self.state.deletes[c][s];
- self._delete(c, s, (o === true) ? undefined : o);
+ var o = d[conf][sid];
+ self.callDelete(conf, sid, (o === true) ? undefined : o);
}
- return _luci2.rpc.flush().then(function(responses) {
+ 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();
- });
- },
+ return self.reorderSections();
+ }).then(function() {
+ pkgs = L.toArray(pkgs);
- _apply: _luci2.rpc.declare({
- object: 'uci',
- method: 'apply',
- params: [ 'timeout', 'rollback' ]
- }),
+ self.unload(pkgs);
- _confirm: _luci2.rpc.declare({
- object: 'uci',
- method: 'confirm'
- }),
+ return self.load(pkgs);
+ });
+ },
apply: function(timeout)
{
if (typeof(timeout) != 'number' || timeout < 1)
timeout = 10;
- self._apply(timeout, true).then(function(rv) {
+ self.callApply(timeout, true).then(function(rv) {
if (rv != 0)
{
deferred.rejectWith(self, [ rv ]);
var try_deadline = date.getTime() + 1000 * timeout;
var try_confirm = function()
{
- return self._confirm().then(function(rv) {
+ return self.callConfirm().then(function(rv) {
if (rv != 0)
{
if (date.getTime() < try_deadline)
return deferred;
},
- changes: _luci2.rpc.declare({
+ changes: L.rpc.declare({
object: 'uci',
method: 'changes',
expect: { changes: { } }
readable: function(conf)
{
- return _luci2.session.hasACL('uci', conf, 'read');
+ return L.session.hasACL('uci', conf, 'read');
},
writable: function(conf)
{
- return _luci2.session.hasACL('uci', conf, 'write');
+ return L.session.hasACL('uci', conf, 'write');
}
});
this.uci = new this.UCIContext();
this.wireless = {
- listDeviceNames: _luci2.rpc.declare({
+ listDeviceNames: L.rpc.declare({
object: 'iwinfo',
method: 'devices',
expect: { 'devices': [ ] },
}
}),
- getDeviceStatus: _luci2.rpc.declare({
+ getDeviceStatus: L.rpc.declare({
object: 'iwinfo',
method: 'info',
params: [ 'device' ],
}
}),
- getAssocList: _luci2.rpc.declare({
+ getAssocList: L.rpc.declare({
object: 'iwinfo',
method: 'assoclist',
params: [ 'device' ],
getWirelessStatus: function() {
return this.listDeviceNames().then(function(names) {
- _luci2.rpc.batch();
+ L.rpc.batch();
for (var i = 0; i < names.length; i++)
- _luci2.wireless.getDeviceStatus(names[i]);
+ L.wireless.getDeviceStatus(names[i]);
- return _luci2.rpc.flush();
+ return L.rpc.flush();
}).then(function(networks) {
var rv = { };
getAssocLists: function()
{
return this.listDeviceNames().then(function(names) {
- _luci2.rpc.batch();
+ L.rpc.batch();
for (var i = 0; i < names.length; i++)
- _luci2.wireless.getAssocList(names[i]);
+ L.wireless.getAssocList(names[i]);
- return _luci2.rpc.flush();
+ return L.rpc.flush();
}).then(function(assoclists) {
var rv = [ ];
}
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, ', ')
);
);
}
- return _luci2.tr('Unknown');
+ return L.tr('Unknown');
}
};
var self = this;
var zone = undefined;
- return _luci2.uci.sections('firewall', 'zone', function(z) {
+ return L.uci.sections('firewall', 'zone', function(z) {
if (!z.name || !z.network)
return;
};
this.NetworkModel = {
- _device_blacklist: [
+ deviceBlacklist: [
/^gre[0-9]+$/,
/^gretap[0-9]+$/,
/^ifb[0-9]+$/,
/^wlan[0-9]+\.sta[0-9]+$/
],
- _cache_functions: [
- 'protolist', 0, _luci2.rpc.declare({
+ rpcCacheFunctions: [
+ 'protolist', 0, L.rpc.declare({
object: 'network',
method: 'get_proto_handlers',
expect: { '': { } }
}),
- 'ifstate', 1, _luci2.rpc.declare({
+ 'ifstate', 1, L.rpc.declare({
object: 'network.interface',
method: 'dump',
expect: { 'interface': [ ] }
}),
- 'devstate', 2, _luci2.rpc.declare({
+ 'devstate', 2, L.rpc.declare({
object: 'network.device',
method: 'status',
expect: { '': { } }
}),
- 'wifistate', 0, _luci2.rpc.declare({
+ 'wifistate', 0, L.rpc.declare({
object: 'network.wireless',
method: 'status',
expect: { '': { } }
}),
- 'bwstate', 2, _luci2.rpc.declare({
+ 'bwstate', 2, L.rpc.declare({
object: 'luci2.network.bwmon',
method: 'statistics',
expect: { 'statistics': { } }
}),
- 'devlist', 2, _luci2.rpc.declare({
+ 'devlist', 2, L.rpc.declare({
object: 'luci2.network',
method: 'device_list',
expect: { 'devices': [ ] }
}),
- 'swlist', 0, _luci2.rpc.declare({
+ 'swlist', 0, L.rpc.declare({
object: 'luci2.network',
method: 'switch_list',
expect: { 'switches': [ ] }
})
],
- _fetch_protocol: function(proto)
+ loadProtocolHandler: function(proto)
{
- var url = _luci2.globals.resource + '/proto/' + proto + '.js';
- var self = _luci2.NetworkModel;
+ var url = L.globals.resource + '/proto/' + proto + '.js';
+ var self = L.NetworkModel;
var def = $.Deferred();
var protoConstructorSource = (
'(function(L, $) { ' +
'return %s' +
- '})(_luci2, $);\n\n' +
+ '})(L, $);\n\n' +
'//@ sourceURL=%s'
).format(data, url);
var protoClass = eval(protoConstructorSource);
- self._protos[proto] = new protoClass();
+ self.protocolHandlers[proto] = new protoClass();
}
catch(e) {
alert('Unable to instantiate proto "%s": %s'.format(url, e));
return def;
},
- _fetch_protocols: function()
+ loadProtocolHandlers: function()
{
- var self = _luci2.NetworkModel;
- var deferreds = [ ];
+ var self = L.NetworkModel;
+ var deferreds = [
+ self.loadProtocolHandler('none')
+ ];
- for (var proto in self._cache.protolist)
- deferreds.push(self._fetch_protocol(proto));
+ for (var proto in self.rpcCache.protolist)
+ deferreds.push(self.loadProtocolHandler(proto));
return $.when.apply($, deferreds);
},
- _fetch_swstate: _luci2.rpc.declare({
+ callSwitchInfo: L.rpc.declare({
object: 'luci2.network',
method: 'switch_info',
params: [ 'switch' ],
expect: { 'info': { } }
}),
- _fetch_swstate_cb: function(responses) {
- var self = _luci2.NetworkModel;
- var swlist = self._cache.swlist;
- var swstate = self._cache.swstate = { };
+ callSwitchInfoCallback: function(responses) {
+ var self = L.NetworkModel;
+ var swlist = self.rpcCache.swlist;
+ var swstate = self.rpcCache.swstate = { };
for (var i = 0; i < responses.length; i++)
swstate[swlist[i]] = responses[i];
},
- _fetch_cache_cb: function(level)
+ loadCacheCallback: function(level)
{
- var self = _luci2.NetworkModel;
+ 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();
+ for (var i = 0; i < self.rpcCacheFunctions.length; i += 3)
+ if (!level || self.rpcCacheFunctions[i + 1] == level)
+ self.rpcCache[self.rpcCacheFunctions[i]] = responses.shift();
if (!level)
{
- _luci2.rpc.batch();
+ L.rpc.batch();
- for (var i = 0; i < self._cache.swlist.length; i++)
- self._fetch_swstate(self._cache.swlist[i]);
+ for (var i = 0; i < self.rpcCache.swlist.length; i++)
+ self.callSwitchInfo(self.rpcCache.swlist[i]);
- return _luci2.rpc.flush().then(self._fetch_swstate_cb);
+ return L.rpc.flush().then(self.callSwitchInfoCallback);
}
- return _luci2.deferrable();
+ return L.deferrable();
}
);
},
- _fetch_cache: function(level)
+ loadCache: function(level)
{
- var self = _luci2.NetworkModel;
+ var self = L.NetworkModel;
- return _luci2.uci.load(['network', 'wireless']).then(function() {
- _luci2.rpc.batch();
+ 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]();
+ for (var i = 0; i < self.rpcCacheFunctions.length; i += 3)
+ if (!level || self.rpcCacheFunctions[i + 1] == level)
+ self.rpcCacheFunctions[i + 2]();
- return _luci2.rpc.flush().then(self._fetch_cache_cb(level || 0));
+ return L.rpc.flush().then(self.loadCacheCallback(level || 0));
});
},
- _get: function(pkg, sid, key)
- {
- return _luci2.uci.get(pkg, sid, key);
- },
-
- _set: function(pkg, sid, key, val)
+ isBlacklistedDevice: function(dev)
{
- return _luci2.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]))
+ for (var i = 0; i < this.deviceBlacklist.length; i++)
+ if (dev.match(this.deviceBlacklist[i]))
return true;
return false;
},
- _sort_devices: function(a, b)
+ sortDevicesCallback: function(a, b)
{
if (a.options.kind < b.options.kind)
return -1;
return 0;
},
- _get_dev: function(ifname)
+ getDeviceObject: function(ifname)
{
var alias = (ifname.charAt(0) == '@');
- return this._devs[ifname] || (
- this._devs[ifname] = {
+ return this.deviceObjects[ifname] || (
+ this.deviceObjects[ifname] = {
ifname: ifname,
kind: alias ? 'alias' : 'ethernet',
type: alias ? 0 : 1,
);
},
- _get_iface: function(name)
+ getInterfaceObject: function(name)
{
- return this._ifaces[name] || (
- this._ifaces[name] = {
+ return this.interfaceObjects[name] || (
+ this.interfaceObjects[name] = {
name: name,
- proto: this._protos.none,
+ proto: this.protocolHandlers.none,
changed: { }
}
);
},
- _parse_devices: function()
+ loadDevicesCallback: function()
{
- var self = _luci2.NetworkModel;
+ var self = L.NetworkModel;
var wificount = { };
- for (var ifname in self._cache.devstate)
+ for (var ifname in self.rpcCache.devstate)
{
- if (self._is_blacklisted(ifname))
+ if (self.isBlacklistedDevice(ifname))
continue;
- var dev = self._cache.devstate[ifname];
- var entry = self._get_dev(ifname);
+ var dev = self.rpcCache.devstate[ifname];
+ var entry = self.getDeviceObject(ifname);
entry.up = dev.up;
}
}
- for (var i = 0; i < self._cache.devlist.length; i++)
+ for (var i = 0; i < self.rpcCache.devlist.length; i++)
{
- var dev = self._cache.devlist[i];
+ var dev = self.rpcCache.devlist[i];
- if (self._is_blacklisted(dev.device))
+ if (self.isBlacklistedDevice(dev.device))
continue;
- var entry = self._get_dev(dev.device);
+ var entry = self.getDeviceObject(dev.device);
entry.up = dev.is_up;
entry.type = dev.type;
}
}
- var net = _luci2.uci.sections('network');
+ var net = L.uci.sections('network');
for (var i = 0; i < net.length; i++)
{
var s = net[i];
if (s['.type'] == 'device' && s.name)
{
- var entry = self._get_dev(s.name);
+ var entry = self.getDeviceObject(s.name);
switch (s.type)
{
}
else if (s['.type'] == 'interface' && !s['.anonymous'] && s.ifname)
{
- var ifnames = _luci2.toArray(s.ifname);
+ var ifnames = L.toArray(s.ifname);
for (var j = 0; j < ifnames.length; j++)
- self._get_dev(ifnames[j]);
+ self.getDeviceObject(ifnames[j]);
if (s['.name'] != 'loopback')
{
- var entry = self._get_dev('@%s'.format(s['.name']));
+ var entry = self.getDeviceObject('@%s'.format(s['.name']));
entry.type = 0;
entry.kind = 'alias';
}
else if (s['.type'] == 'switch_vlan' && s.device)
{
- var sw = self._cache.swstate[s.device];
+ var sw = self.rpcCache.swstate[s.device];
var vid = parseInt(s.vid || s.vlan);
- var ports = _luci2.toArray(s.ports);
+ var ports = L.toArray(s.ports);
if (!sw || !ports.length || isNaN(vid))
continue;
if (!ifname)
continue;
- var entry = self._get_dev(ifname);
+ var entry = self.getDeviceObject(ifname);
entry.kind = 'vlan';
entry.sid = sid;
}
}
- var wifi = _luci2.uci.sections('wireless');
+ var wifi = L.uci.sections('wireless');
for (var i = 0; i < wifi.length; i++)
{
var s = wifi[i];
var id = 'radio%d.network%d'.format(r, n);
var ifname = id;
- if (self._cache.wifistate[s.device])
+ if (self.rpcCache.wifistate[s.device])
{
- var ifcs = self._cache.wifistate[s.device].interfaces;
+ var ifcs = self.rpcCache.wifistate[s.device].interfaces;
for (var ifc in ifcs)
{
- if (ifcs[ifc].section == sid)
+ if (ifcs[ifc].section == sid && ifcs[ifc].ifname)
{
ifname = ifcs[ifc].ifname;
break;
}
}
- var entry = self._get_dev(ifname);
+ var entry = self.getDeviceObject(ifname);
entry.kind = 'wifi';
entry.sid = sid;
if (s['.type'] == 'interface' && !s['.anonymous'] && s.type == 'bridge')
{
- var ifnames = _luci2.toArray(s.ifname);
+ var ifnames = L.toArray(s.ifname);
- for (var ifname in self._devs)
+ for (var ifname in self.deviceObjects)
{
- var dev = self._devs[ifname];
+ var dev = self.deviceObjects[ifname];
if (dev.kind != 'wifi')
continue;
- var wnets = _luci2.toArray(_luci2.uci.get('wireless', dev.sid, 'network'));
+ 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 = self.getDeviceObject('br-%s'.format(s['.name']));
entry.type = 1;
entry.kind = 'bridge';
entry.sid = sid;
}
},
- _parse_interfaces: function()
+ loadInterfacesCallback: function()
{
- var self = _luci2.NetworkModel;
- var net = _luci2.uci.sections('network');
+ var self = L.NetworkModel;
+ var net = L.uci.sections('network');
for (var i = 0; i < net.length; i++)
{
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 entry = self.getInterfaceObject(s['.name']);
+ var proto = self.protocolHandlers[s.proto] || self.protocolHandlers.none;
var l3dev = undefined;
var l2dev = undefined;
- var ifnames = _luci2.toArray(s.ifname);
+ var ifnames = L.toArray(s.ifname);
- for (var ifname in self._devs)
+ for (var ifname in self.deviceObjects)
{
- var dev = self._devs[ifname];
+ var dev = self.deviceObjects[ifname];
if (dev.kind != 'wifi')
continue;
- var wnets = _luci2.toArray(_luci2.uci.get('wireless', dev.sid, 'network'));
+ var wnets = L.toArray(L.uci.get('wireless', dev.sid, 'network'));
if ($.inArray(entry.name, wnets) > -1)
ifnames.push(ifname);
}
}
}
- for (var i = 0; i < self._cache.ifstate.length; i++)
+ for (var i = 0; i < self.rpcCache.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;
+ var iface = self.rpcCache.ifstate[i];
+ var entry = self.getInterfaceObject(iface['interface']);
+ var proto = self.protocolHandlers[iface.proto] || self.protocolHandlers.none;
/* this is a virtual interface, either deleted from config but
not applied yet or set up from external tools (6rd) */
{
var self = this;
- if (self._cache)
- return _luci2.deferrable();
+ if (self.rpcCache)
+ return L.deferrable();
- self._cache = { };
- self._devs = { };
- self._ifaces = { };
- self._protos = { };
+ self.rpcCache = { };
+ self.deviceObjects = { };
+ self.interfaceObjects = { };
+ self.protocolHandlers = { };
- return self._fetch_cache()
- .then(self._fetch_protocols)
- .then(self._parse_devices)
- .then(self._parse_interfaces);
+ return self.loadCache()
+ .then(self.loadProtocolHandlers)
+ .then(self.loadDevicesCallback)
+ .then(self.loadInterfacesCallback);
},
update: function()
{
- delete this._cache;
+ delete this.rpcCache;
return this.init();
},
refreshInterfaceStatus: function()
{
- return this._fetch_cache(1).then(this._parse_interfaces);
+ return this.loadCache(1).then(this.loadInterfacesCallback);
},
refreshDeviceStatus: function()
{
- return this._fetch_cache(2).then(this._parse_devices);
+ return this.loadCache(2).then(this.loadDevicesCallback);
},
refreshStatus: function()
{
- return this._fetch_cache(1)
- .then(this._fetch_cache(2))
- .then(this._parse_devices)
- .then(this._parse_interfaces);
+ return this.loadCache(1)
+ .then(this.loadCache(2))
+ .then(this.loadDevicesCallback)
+ .then(this.loadInterfacesCallback);
},
getDevices: function()
{
var devs = [ ];
- for (var ifname in this._devs)
+ for (var ifname in this.deviceObjects)
if (ifname != 'lo')
- devs.push(new _luci2.NetworkModel.Device(this._devs[ifname]));
+ devs.push(new L.NetworkModel.Device(this.deviceObjects[ifname]));
- return devs.sort(this._sort_devices);
+ return devs.sort(this.sortDevicesCallback);
},
getDeviceByInterface: function(iface)
{
- if (iface instanceof _luci2.NetworkModel.Interface)
+ 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);
+ if (this.interfaceObjects[iface])
+ return this.getDevice(this.interfaceObjects[iface].l3dev) ||
+ this.getDevice(this.interfaceObjects[iface].l2dev);
return undefined;
},
getDevice: function(ifname)
{
- if (this._devs[ifname])
- return new _luci2.NetworkModel.Device(this._devs[ifname]);
+ if (this.deviceObjects[ifname])
+ return new L.NetworkModel.Device(this.deviceObjects[ifname]);
return undefined;
},
createDevice: function(name)
{
- return new _luci2.NetworkModel.Device(this._get_dev(name));
+ return new L.NetworkModel.Device(this.getDeviceObject(name));
},
getInterfaces: function()
{
var ifaces = [ ];
- for (var name in this._ifaces)
+ for (var name in this.interfaceObjects)
if (name != 'loopback')
ifaces.push(this.getInterface(name));
{
var ifaces = [ ];
- if (dev instanceof _luci2.NetworkModel.Device)
+ if (dev instanceof L.NetworkModel.Device)
dev = dev.name();
- for (var name in this._ifaces)
+ for (var name in this.interfaceObjects)
{
- var iface = this._ifaces[name];
+ var iface = this.interfaceObjects[name];
if (iface.l2dev == dev || iface.l3dev == dev)
ifaces.push(this.getInterface(name));
}
getInterface: function(iface)
{
- if (this._ifaces[iface])
- return new _luci2.NetworkModel.Interface(this._ifaces[iface]);
+ if (this.interfaceObjects[iface])
+ return new L.NetworkModel.Interface(this.interfaceObjects[iface]);
return undefined;
},
{
var rv = [ ];
- for (var proto in this._protos)
+ for (var proto in this.protocolHandlers)
{
- var pr = this._protos[proto];
+ var pr = this.protocolHandlers[proto];
rv.push({
name: proto,
});
},
- _find_wan: function(ipaddr)
+ findWANByAddr: function(ipaddr)
{
- for (var i = 0; i < this._cache.ifstate.length; i++)
+ for (var i = 0; i < this.rpcCache.ifstate.length; i++)
{
- var ifstate = this._cache.ifstate[i];
+ var ifstate = this.rpcCache.ifstate[i];
if (!ifstate.route)
continue;
findWAN: function()
{
- return this._find_wan('0.0.0.0');
+ return this.findWANByAddr('0.0.0.0');
},
findWAN6: function()
{
- return this._find_wan('::');
+ return this.findWANByAddr('::');
},
resolveAlias: function(ifname)
{
- if (ifname instanceof _luci2.NetworkModel.Device)
+ if (ifname instanceof L.NetworkModel.Device)
ifname = ifname.name();
- var dev = this._devs[ifname];
+ var dev = this.deviceObjects[ifname];
var seen = { };
while (dev && dev.kind == 'alias')
if (seen[dev.ifname])
return undefined;
- var ifc = this._ifaces[dev.sid];
+ var ifc = this.interfaceObjects[dev.sid];
seen[dev.ifname] = true;
- dev = ifc ? this._devs[ifc.l3dev] : undefined;
+ dev = ifc ? this.deviceObjects[ifc.l3dev] : undefined;
}
return dev ? this.getDevice(dev.ifname) : undefined;
};
this.NetworkModel.Device = Class.extend({
- _wifi_modes: {
- ap: _luci2.tr('Master'),
- sta: _luci2.tr('Client'),
- adhoc: _luci2.tr('Ad-Hoc'),
- monitor: _luci2.tr('Monitor'),
- wds: _luci2.tr('Static WDS')
+ wifiModeStrings: {
+ 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)
+ getStatus: function(key)
{
- var s = _luci2.NetworkModel._cache.devstate[this.options.ifname];
+ var s = L.NetworkModel.rpcCache.devstate[this.options.ifname];
if (s)
return key ? s[key] : s;
{
var sid = this.options.sid;
var pkg = (this.options.kind == 'wifi') ? 'wireless' : 'network';
- return _luci2.NetworkModel._get(pkg, sid, key);
+ return L.uci.get(pkg, sid, key);
},
set: function(key, val)
{
var sid = this.options.sid;
var pkg = (this.options.kind == 'wifi') ? 'wireless' : 'network';
- return _luci2.NetworkModel._set(pkg, sid, key, val);
+ return L.uci.set(pkg, sid, key, val);
},
init: function()
switch (this.options.kind)
{
case 'alias':
- return _luci2.tr('Alias for network "%s"').format(this.options.ifname.substring(1));
+ return L.tr('Alias for network "%s"').format(this.options.ifname.substring(1));
case 'bridge':
- return _luci2.tr('Network bridge');
+ return L.tr('Network bridge');
case 'ethernet':
- return _luci2.tr('Network device');
+ return L.tr('Network device');
case 'tunnel':
switch (this.options.type)
{
case 1: /* tuntap */
- return _luci2.tr('TAP device');
+ return L.tr('TAP device');
case 512: /* PPP */
- return _luci2.tr('PPP tunnel');
+ return L.tr('PPP tunnel');
case 768: /* IP-IP Tunnel */
- return _luci2.tr('IP-in-IP tunnel');
+ return L.tr('IP-in-IP tunnel');
case 769: /* IP6-IP6 Tunnel */
- return _luci2.tr('IPv6-in-IPv6 tunnel');
+ return L.tr('IPv6-in-IPv6 tunnel');
case 776: /* IPv6-in-IPv4 */
- return _luci2.tr('IPv6-over-IPv4 tunnel');
+ return L.tr('IPv6-over-IPv4 tunnel');
break;
case 778: /* GRE over IP */
- return _luci2.tr('GRE-over-IP tunnel');
+ return L.tr('GRE-over-IP tunnel');
default:
- return _luci2.tr('Tunnel device');
+ return L.tr('Tunnel device');
}
case 'vlan':
- return _luci2.tr('VLAN %d on %s').format(this.options.vid, this.options.vsw.model);
+ return L.tr('VLAN %d on %s').format(this.options.vid, this.options.vsw.model);
case 'wifi':
var o = this.options;
- return _luci2.trc('(Wifi-Mode) "(SSID)" on (radioX)', '%s "%h" on %s').format(
- o.wmode ? this._wifi_modes[o.wmode] : _luci2.tr('Unknown mode'),
+ return L.trc('(Wifi-Mode) "(SSID)" on (radioX)', '%s "%h" on %s').format(
+ o.wmode ? this.wifiModeStrings[o.wmode] : L.tr('Unknown mode'),
o.wssid || '?', o.wdev
);
}
- return _luci2.tr('Unknown device');
+ return L.tr('Unknown device');
},
icon: function(up)
if (typeof(up) == 'undefined')
up = this.isUp();
- return _luci2.globals.resource + '/icons/%s%s.png'.format(kind, up ? '' : '_disabled');
+ return L.globals.resource + '/icons/%s%s.png'.format(kind, up ? '' : '_disabled');
},
isUp: function()
{
- var l = _luci2.NetworkModel._cache.devlist;
+ var l = L.NetworkModel.rpcCache.devlist;
for (var i = 0; i < l.length; i++)
if (l[i].device == this.options.ifname)
isInNetwork: function(net)
{
- if (!(net instanceof _luci2.NetworkModel.Interface))
- net = _luci2.NetworkModel.getInterface(net);
+ if (!(net instanceof L.NetworkModel.Interface))
+ net = L.NetworkModel.getInterface(net);
if (net)
{
net.options.l2dev == this.options.ifname)
return true;
- var dev = _luci2.NetworkModel._devs[net.options.l2dev];
+ var dev = L.NetworkModel.deviceObjects[net.options.l2dev];
if (dev && dev.kind == 'bridge' && dev.ports)
return ($.inArray(this.options.ifname, dev.ports) > -1);
}
getMTU: function()
{
- var dev = _luci2.NetworkModel._cache.devstate[this.options.ifname];
+ var dev = L.NetworkModel.rpcCache.devstate[this.options.ifname];
if (dev && !isNaN(dev.mtu))
return dev.mtu;
if (this.options.type != 1)
return undefined;
- var dev = _luci2.NetworkModel._cache.devstate[this.options.ifname];
+ var dev = L.NetworkModel.rpcCache.devstate[this.options.ifname];
if (dev && dev.macaddr)
return dev.macaddr.toUpperCase();
getInterfaces: function()
{
- return _luci2.NetworkModel.getInterfacesByDevice(this.options.name);
+ return L.NetworkModel.getInterfacesByDevice(this.options.name);
},
getStatistics: function()
{
- var s = this._status('statistics') || { };
+ var s = this.getStatus('statistics') || { };
return {
rx_bytes: (s.rx_bytes || 0),
tx_bytes: (s.tx_bytes || 0),
for (var i = 0; i < 120; i++)
def[i] = 0;
- var h = _luci2.NetworkModel._cache.bwstate[this.options.ifname] || { };
+ var h = L.NetworkModel.rpcCache.bwstate[this.options.ifname] || { };
return {
rx_bytes: (h.rx_bytes || def),
tx_bytes: (h.tx_bytes || def),
removeFromInterface: function(iface)
{
- if (!(iface instanceof _luci2.NetworkModel.Interface))
- iface = _luci2.NetworkModel.getInterface(iface);
+ if (!(iface instanceof L.NetworkModel.Interface))
+ iface = L.NetworkModel.getInterface(iface);
if (!iface)
return;
- var ifnames = _luci2.toArray(iface.get('ifname'));
+ var ifnames = L.toArray(iface.get('ifname'));
if ($.inArray(this.options.ifname, ifnames) > -1)
- iface.set('ifname', _luci2.filterArray(ifnames, this.options.ifname));
+ iface.set('ifname', L.filterArray(ifnames, this.options.ifname));
if (this.options.kind != 'wifi')
return;
- var networks = _luci2.toArray(this.get('network'));
+ var networks = L.toArray(this.get('network'));
if ($.inArray(iface.name(), networks) > -1)
- this.set('network', _luci2.filterArray(networks, iface.name()));
+ this.set('network', L.filterArray(networks, iface.name()));
},
attachToInterface: function(iface)
{
- if (!(iface instanceof _luci2.NetworkModel.Interface))
- iface = _luci2.NetworkModel.getInterface(iface);
+ if (!(iface instanceof L.NetworkModel.Interface))
+ iface = L.NetworkModel.getInterface(iface);
if (!iface)
return;
if (this.options.kind != 'wifi')
{
- var ifnames = _luci2.toArray(iface.get('ifname'));
+ var ifnames = L.toArray(iface.get('ifname'));
if ($.inArray(this.options.ifname, ifnames) < 0)
{
ifnames.push(this.options.ifname);
}
else
{
- var networks = _luci2.toArray(this.get('network'));
+ var networks = L.toArray(this.get('network'));
if ($.inArray(iface.name(), networks) < 0)
{
networks.push(iface.name());
});
this.NetworkModel.Interface = Class.extend({
- _status: function(key)
+ getStatus: function(key)
{
- var s = _luci2.NetworkModel._cache.ifstate;
+ var s = L.NetworkModel.rpcCache.ifstate;
for (var i = 0; i < s.length; i++)
if (s[i]['interface'] == this.options.name)
get: function(key)
{
- return _luci2.NetworkModel._get('network', this.options.name, key);
+ return L.uci.get('network', this.options.name, key);
},
set: function(key, val)
{
- return _luci2.NetworkModel._set('network', this.options.name, key, val);
+ return L.uci.set('network', this.options.name, key, val);
},
name: function()
isUp: function()
{
- return (this._status('up') === true);
+ return (this.getStatus('up') === true);
},
isVirtual: function()
getProtocol: function()
{
var prname = this.get('proto') || 'none';
- return _luci2.NetworkModel._protos[prname] || _luci2.NetworkModel._protos.none;
+ return L.NetworkModel.protocolHandlers[prname] || L.NetworkModel.protocolHandlers.none;
},
getUptime: function()
{
- var uptime = this._status('uptime');
+ var uptime = this.getStatus('uptime');
return isNaN(uptime) ? 0 : uptime;
},
getDevice: function(resolveAlias)
{
if (this.options.l3dev)
- return _luci2.NetworkModel.getDevice(this.options.l3dev);
+ return L.NetworkModel.getDevice(this.options.l3dev);
return undefined;
},
getPhysdev: function()
{
if (this.options.l2dev)
- return _luci2.NetworkModel.getDevice(this.options.l2dev);
+ return L.NetworkModel.getDevice(this.options.l2dev);
return undefined;
},
{
var rv = [ ];
var dev = this.options.l2dev ?
- _luci2.NetworkModel._devs[this.options.l2dev] : undefined;
+ L.NetworkModel.deviceObjects[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(_luci2.NetworkModel.getDevice(dev.ports[i]));
+ rv.push(L.NetworkModel.getDevice(dev.ports[i]));
return rv;
},
getIPv4Addrs: function(mask)
{
var rv = [ ];
- var addrs = this._status('ipv4-address');
+ var addrs = this.getStatus('ipv4-address');
if (addrs)
for (var i = 0; i < addrs.length; i++)
var rv = [ ];
var addrs;
- addrs = this._status('ipv6-address');
+ addrs = this.getStatus('ipv6-address');
if (addrs)
for (var i = 0; i < addrs.length; i++)
else
rv.push('%s/%d'.format(addrs[i].address, addrs[i].mask));
- addrs = this._status('ipv6-prefix-assignment');
+ addrs = this.getStatus('ipv6-prefix-assignment');
if (addrs)
for (var i = 0; i < addrs.length; i++)
getDNSAddrs: function()
{
var rv = [ ];
- var addrs = this._status('dns-server');
+ var addrs = this.getStatus('dns-server');
if (addrs)
for (var i = 0; i < addrs.length; i++)
getIPv4DNS: function()
{
var rv = [ ];
- var dns = this._status('dns-server');
+ var dns = this.getStatus('dns-server');
if (dns)
for (var i = 0; i < dns.length; i++)
getIPv6DNS: function()
{
var rv = [ ];
- var dns = this._status('dns-server');
+ var dns = this.getStatus('dns-server');
if (dns)
for (var i = 0; i < dns.length; i++)
getIPv4Gateway: function()
{
- var rt = this._status('route');
+ var rt = this.getStatus('route');
if (rt)
for (var i = 0; i < rt.length; i++)
getIPv6Gateway: function()
{
- var rt = this._status('route');
+ var rt = this.getStatus('route');
if (rt)
for (var i = 0; i < rt.length; i++)
getStatistics: function()
{
- var dev = this.getDevice() || new _luci2.NetworkModel.Device({});
+ var dev = this.getDevice() || new L.NetworkModel.Device({});
return dev.getStatistics();
},
getTrafficHistory: function()
{
- var dev = this.getDevice() || new _luci2.NetworkModel.Device({});
+ var dev = this.getDevice() || new L.NetworkModel.Device({});
return dev.getTrafficHistory();
},
+ renderBadge: function()
+ {
+ var badge = $('<span />')
+ .addClass('badge')
+ .text('%s: '.format(this.name()));
+
+ var dev = this.getDevice();
+ var subdevs = this.getSubdevices();
+
+ if (subdevs.length)
+ for (var j = 0; j < subdevs.length; j++)
+ badge.append($('<img />')
+ .attr('src', subdevs[j].icon())
+ .attr('title', '%s (%s)'.format(subdevs[j].description(), subdevs[j].name() || '?')));
+ else if (dev)
+ badge.append($('<img />')
+ .attr('src', dev.icon())
+ .attr('title', '%s (%s)'.format(dev.description(), dev.name() || '?')));
+ else
+ badge.append($('<em />').text(L.tr('(No devices attached)')));
+
+ return badge;
+ },
+
setDevices: function(devs)
{
var dev = this.getPhysdev();
{
var dev = devs[i];
- if (dev instanceof _luci2.NetworkModel.Device)
+ if (dev instanceof L.NetworkModel.Device)
dev = dev.name();
if (!dev || old_devs[i].name() != dev)
{
var dev = devs[i];
- if (!(dev instanceof _luci2.NetworkModel.Device))
- dev = _luci2.NetworkModel.getDevice(dev);
+ if (!(dev instanceof L.NetworkModel.Device))
+ dev = L.NetworkModel.getDevice(dev);
if (dev)
dev.attachToInterface(this);
changeProtocol: function(proto)
{
- var pr = _luci2.NetworkModel._protos[proto];
+ var pr = L.NetworkModel.protocolHandlers[proto];
if (!pr)
return;
var device = self.getDevice();
if (!mapwidget)
- mapwidget = _luci2.cbi.Map;
+ mapwidget = L.cbi.Map;
var map = new mapwidget('network', {
- caption: _luci2.tr('Configure "%s"').format(self.name())
+ caption: L.tr('Configure "%s"').format(self.name())
});
- var section = map.section(_luci2.cbi.SingleSection, self.name(), {
+ var section = map.section(L.cbi.SingleSection, self.name(), {
anonymous: true
});
section.tab({
id: 'general',
- caption: _luci2.tr('General Settings')
+ caption: L.tr('General Settings')
});
section.tab({
id: 'advanced',
- caption: _luci2.tr('Advanced Settings')
+ caption: L.tr('Advanced Settings')
});
section.tab({
id: 'ipv6',
- caption: _luci2.tr('IPv6')
+ caption: L.tr('IPv6')
});
section.tab({
id: 'physical',
- caption: _luci2.tr('Physical Settings')
+ caption: L.tr('Physical Settings')
});
- section.taboption('general', _luci2.cbi.CheckboxValue, 'auto', {
- caption: _luci2.tr('Start on boot'),
+ section.taboption('general', L.cbi.CheckboxValue, 'auto', {
+ caption: L.tr('Start on boot'),
optional: true,
initial: true
});
- var pr = section.taboption('general', _luci2.cbi.ListValue, 'proto', {
- caption: _luci2.tr('Protocol')
+ var pr = section.taboption('general', L.cbi.ListValue, 'proto', {
+ caption: L.tr('Protocol')
});
pr.ucivalue = function(sid) {
return self.get('proto') || 'none';
};
- var ok = section.taboption('general', _luci2.cbi.ButtonValue, '_confirm', {
- caption: _luci2.tr('Really switch?'),
- description: _luci2.tr('Changing the protocol will clear all configuration for this interface!'),
- text: _luci2.tr('Change protocol')
+ 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.createForm(mapwidget).show();
});
- var protos = _luci2.NetworkModel.getProtocols();
+ var protos = L.NetworkModel.getProtocols();
for (var i = 0; i < protos.length; i++)
pr.value(protos[i].name, protos[i].description);
if (!proto.virtual)
{
- var br = section.taboption('physical', _luci2.cbi.CheckboxValue, 'type', {
- caption: _luci2.tr('Network bridge'),
- description: _luci2.tr('Merges multiple devices into one logical bridge'),
+ 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: ''
});
- section.taboption('physical', _luci2.cbi.DeviceList, '__iface_multi', {
- caption: _luci2.tr('Devices'),
+ section.taboption('physical', L.cbi.DeviceList, '__iface_multi', {
+ caption: L.tr('Devices'),
multiple: true,
bridges: false
}).depends('type', true);
- section.taboption('physical', _luci2.cbi.DeviceList, '__iface_single', {
- caption: _luci2.tr('Device'),
+ section.taboption('physical', L.cbi.DeviceList, '__iface_single', {
+ caption: L.tr('Device'),
multiple: false,
bridges: true
}).depends('type', false);
- var mac = section.taboption('physical', _luci2.cbi.InputValue, 'macaddr', {
- caption: _luci2.tr('Override MAC'),
+ var mac = section.taboption('physical', L.cbi.InputValue, 'macaddr', {
+ caption: L.tr('Override MAC'),
optional: true,
placeholder: device ? device.getMACAddress() : undefined,
datatype: 'macaddr'
};
}
- section.taboption('physical', _luci2.cbi.InputValue, 'mtu', {
- caption: _luci2.tr('Override MTU'),
+ section.taboption('physical', L.cbi.InputValue, 'mtu', {
+ caption: L.tr('Override MTU'),
optional: true,
placeholder: device ? device.getMTU() : undefined,
datatype: 'range(1, 9000)'
});
- section.taboption('physical', _luci2.cbi.InputValue, 'metric', {
- caption: _luci2.tr('Override Metric'),
+ section.taboption('physical', L.cbi.InputValue, 'metric', {
+ caption: L.tr('Override Metric'),
optional: true,
placeholder: 0,
datatype: 'uinteger'
});
this.system = {
- getSystemInfo: _luci2.rpc.declare({
+ getSystemInfo: L.rpc.declare({
object: 'system',
method: 'info',
expect: { '': { } }
}),
- getBoardInfo: _luci2.rpc.declare({
+ getBoardInfo: L.rpc.declare({
object: 'system',
method: 'board',
expect: { '': { } }
}),
- getDiskInfo: _luci2.rpc.declare({
+ getDiskInfo: L.rpc.declare({
object: 'luci2.system',
method: 'diskfree',
expect: { '': { } }
getInfo: function(cb)
{
- _luci2.rpc.batch();
+ L.rpc.batch();
this.getSystemInfo();
this.getBoardInfo();
this.getDiskInfo();
- return _luci2.rpc.flush().then(function(info) {
+ return L.rpc.flush().then(function(info) {
var rv = { };
$.extend(rv, info[0]);
});
},
- getProcessList: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'process_list',
- expect: { processes: [ ] },
- filter: function(data) {
- data.sort(function(a, b) { return a.pid - b.pid });
- return data;
- }
- }),
-
- getSystemLog: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'syslog',
- expect: { log: '' }
- }),
-
- getKernelLog: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'dmesg',
- expect: { log: '' }
- }),
-
- getZoneInfo: function(cb)
- {
- return $.getJSON(_luci2.globals.resource + '/zoneinfo.json', cb);
- },
-
- sendSignal: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'process_signal',
- params: [ 'pid', 'signal' ],
- filter: function(data) {
- return (data == 0);
- }
- }),
- initList: _luci2.rpc.declare({
+ initList: L.rpc.declare({
object: 'luci2.system',
method: 'init_list',
expect: { initscripts: [ ] },
});
},
- initRun: _luci2.rpc.declare({
+ initRun: L.rpc.declare({
object: 'luci2.system',
method: 'init_action',
params: [ 'name', 'action' ],
}
}),
- 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) },
+ 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) },
- getRcLocal: _luci2.rpc.declare({
+ performReboot: L.rpc.declare({
object: 'luci2.system',
- method: 'rclocal_get',
- expect: { data: '' }
- }),
+ method: 'reboot'
+ })
+ };
- setRcLocal: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'rclocal_set',
- params: [ 'data' ]
- }),
+ this.session = {
+ login: L.rpc.declare({
+ object: 'session',
+ method: 'login',
+ params: [ 'username', 'password' ],
+ expect: { '': { } }
+ }),
- getCrontab: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'crontab_get',
- expect: { data: '' }
- }),
-
- setCrontab: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'crontab_set',
- params: [ 'data' ]
- }),
-
-
- getSSHKeys: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'sshkeys_get',
- expect: { keys: [ ] }
- }),
-
- setSSHKeys: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'sshkeys_set',
- params: [ 'keys' ]
- }),
-
-
- setPassword: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'password_set',
- params: [ 'user', 'password' ]
- }),
-
-
- listLEDs: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'led_list',
- expect: { leds: [ ] }
- }),
-
- listUSBDevices: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'usb_list',
- expect: { devices: [ ] }
- }),
-
-
- testUpgrade: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'upgrade_test',
- expect: { '': { } }
- }),
-
- startUpgrade: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'upgrade_start',
- params: [ 'keep' ]
- }),
-
- cleanUpgrade: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'upgrade_clean'
- }),
-
-
- restoreBackup: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'backup_restore'
- }),
-
- cleanBackup: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'backup_clean'
- }),
-
-
- getBackupConfig: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'backup_config_get',
- expect: { config: '' }
- }),
-
- setBackupConfig: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'backup_config_set',
- params: [ 'data' ]
- }),
-
-
- listBackup: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'backup_list',
- expect: { files: [ ] }
- }),
-
-
- testReset: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'reset_test',
- expect: { supported: false }
- }),
-
- startReset: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'reset_start'
- }),
-
-
- performReboot: _luci2.rpc.declare({
- object: 'luci2.system',
- method: 'reboot'
- })
- };
-
- this.opkg = {
- updateLists: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'update',
- expect: { '': { } }
- }),
-
- _allPackages: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'list',
- params: [ 'offset', 'limit', 'pattern' ],
- expect: { '': { } }
- }),
-
- _installedPackages: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'list_installed',
- params: [ 'offset', 'limit', 'pattern' ],
- expect: { '': { } }
- }),
-
- _findPackages: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'find',
- params: [ 'offset', 'limit', 'pattern' ],
- expect: { '': { } }
- }),
-
- _fetchPackages: function(action, offset, limit, pattern)
- {
- var packages = [ ];
-
- return action(offset, limit, pattern).then(function(list) {
- if (!list.total || !list.packages)
- return { length: 0, total: 0 };
-
- packages.push.apply(packages, list.packages);
- packages.total = list.total;
-
- if (limit <= 0)
- limit = list.total;
-
- if (packages.length >= limit)
- return packages;
-
- _luci2.rpc.batch();
-
- for (var i = offset + packages.length; i < limit; i += 100)
- action(i, (Math.min(i + 100, limit) % 100) || 100, pattern);
-
- return _luci2.rpc.flush();
- }).then(function(lists) {
- for (var i = 0; i < lists.length; i++)
- {
- if (!lists[i].total || !lists[i].packages)
- continue;
-
- packages.push.apply(packages, lists[i].packages);
- packages.total = lists[i].total;
- }
-
- return packages;
- });
- },
-
- listPackages: function(offset, limit, pattern)
- {
- return _luci2.opkg._fetchPackages(_luci2.opkg._allPackages, offset, limit, pattern);
- },
-
- installedPackages: function(offset, limit, pattern)
- {
- return _luci2.opkg._fetchPackages(_luci2.opkg._installedPackages, offset, limit, pattern);
- },
-
- findPackages: function(offset, limit, pattern)
- {
- return _luci2.opkg._fetchPackages(_luci2.opkg._findPackages, offset, limit, pattern);
- },
-
- installPackage: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'install',
- params: [ 'package' ],
- expect: { '': { } }
- }),
-
- removePackage: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'remove',
- params: [ 'package' ],
- expect: { '': { } }
- }),
-
- getConfig: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'config_get',
- expect: { config: '' }
- }),
-
- setConfig: _luci2.rpc.declare({
- object: 'luci2.opkg',
- method: 'config_set',
- params: [ 'data' ]
- })
- };
-
- this.session = {
-
- login: _luci2.rpc.declare({
- object: 'session',
- method: 'login',
- params: [ 'username', 'password' ],
- expect: { '': { } }
- }),
-
- access: _luci2.rpc.declare({
- object: 'session',
- method: 'access',
- params: [ 'scope', 'object', 'function' ],
- expect: { access: false }
+ access: L.rpc.declare({
+ object: 'session',
+ method: 'access',
+ params: [ 'scope', 'object', 'function' ],
+ expect: { access: false }
}),
isAlive: function()
{
- return _luci2.session.access('ubus', 'session', 'access');
+ return L.session.access('ubus', 'session', 'access');
},
startHeartbeat: function()
{
this._hearbeatInterval = window.setInterval(function() {
- _luci2.session.isAlive().then(function(alive) {
+ L.session.isAlive().then(function(alive) {
if (!alive)
{
- _luci2.session.stopHeartbeat();
- _luci2.ui.login(true);
+ L.session.stopHeartbeat();
+ L.ui.login(true);
}
});
- }, _luci2.globals.timeout * 2);
+ }, L.globals.timeout * 2);
},
stopHeartbeat: function()
},
- _acls: { },
+ aclCache: { },
- _fetch_acls: _luci2.rpc.declare({
+ callAccess: L.rpc.declare({
object: 'session',
method: 'access',
expect: { '': { } }
}),
- _fetch_acls_cb: function(acls)
+ callAccessCallback: function(acls)
{
- _luci2.session._acls = acls;
+ L.session.aclCache = acls;
},
updateACLs: function()
{
- return _luci2.session._fetch_acls()
- .then(_luci2.session._fetch_acls_cb);
+ return L.session.callAccess()
+ .then(L.session.callAccessCallback);
},
hasACL: function(scope, object, func)
{
- var acls = _luci2.session._acls;
+ var acls = L.session.aclCache;
if (typeof(func) == 'undefined')
return (acls && acls[scope] && acls[scope][object]);
var win = $(window);
var body = $('body');
- var state = _luci2.ui._loading || (_luci2.ui._loading = {
+ var state = L.ui._loading || (L.ui._loading = {
modal: $('<div />')
.css('z-index', 2000)
.addClass('modal fade')
.addClass('modal-content luci2-modal-loader')
.append($('<div />')
.addClass('modal-body')
- .text(_luci2.tr('Loading data…')))))
+ .text(L.tr('Loading data…')))))
.appendTo(body)
.modal({
backdrop: 'static',
var win = $(window);
var body = $('body');
- var state = _luci2.ui._dialog || (_luci2.ui._dialog = {
+ var state = L.ui._dialog || (L.ui._dialog = {
dialog: $('<div />')
.addClass('modal fade')
.append($('<div />')
.addClass('modal-body'))
.append($('<div />')
.addClass('modal-footer')
- .append(_luci2.ui.button(_luci2.tr('Close'), 'primary')
+ .append(L.ui.button(L.tr('Close'), 'primary')
.click(function() {
$(this).parents('div.modal').modal('hide');
})))))
if (options.style == 'confirm')
{
- ftr.append(_luci2.ui.button(_luci2.tr('Ok'), 'primary')
- .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(_luci2.ui.button(_luci2.tr('Cancel'), 'default')
- .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(_luci2.ui.button(_luci2.tr('Close'), 'primary')
- .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(_luci2.ui.button(_luci2.tr('Close'), 'primary')
+ ftr.append(L.ui.button(L.tr('Close'), 'primary')
.attr('disabled', true));
}
upload: function(title, content, options)
{
- var state = _luci2.ui._upload || (_luci2.ui._upload = {
+ var state = L.ui._upload || (L.ui._upload = {
form: $('<form />')
.attr('method', 'post')
.attr('action', '/cgi-bin/luci-upload')
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'), [
- $('<p />').text(_luci2.tr('The file upload failed with the server response below:')),
+ $('<p />').text(L.tr('The file upload failed with the server response below:')),
$('<pre />').addClass('alert-message').text(json.message || json.error[1]),
- $('<p />').text(_luci2.tr('In case of network problems try uploading the file again.'))
+ $('<p />').text(L.tr('In case of network problems try uploading the file again.'))
], { style: 'close' });
}
else if (typeof(state.success_cb) == 'function')
f.hide();
b.show();
- p.text(_luci2.tr('File upload in progress …'));
+ p.text(L.tr('File upload in progress …'));
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 || _luci2.tr('Select the file to upload and press "%s" to proceed.').format(_luci2.tr('Ok')));
+ state.form.find('p').text(content || L.tr('Select the file to upload and press "%s" to proceed.').format(L.tr('Ok')));
- state.form.find('[name=sessionid]').val(_luci2.globals.sid);
+ state.form.find('[name=sessionid]').val(L.globals.sid);
state.form.find('[name=filename]').val(options.filename);
state.success_cb = options.success;
- _luci2.ui.dialog(title || _luci2.tr('File upload'), state.form, {
+ L.ui.dialog(title || L.tr('File upload'), state.form, {
style: 'confirm',
confirm: state.confirm_cb
});
var images = $();
var interval, timeout;
- _luci2.ui.dialog(
- _luci2.tr('Waiting for device'), [
- $('<p />').text(_luci2.tr('Please stand by while the device is reconfiguring …')),
+ L.ui.dialog(
+ L.tr('Waiting for device'), [
+ $('<p />').text(L.tr('Please stand by while the device is reconfiguring …')),
$('<div />')
.css('width', '100%')
.addClass('progressbar')
for (var i = 0; i < protocols.length; i++)
images = images.add($('<img />').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++)
//}).then(function() {
images.on('load', function() {
var url = this.getAttribute('url');
- _luci2.session.isAlive().then(function(access) {
+ 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
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);
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);
login: function(invalid)
{
- var state = _luci2.ui._login || (_luci2.ui._login = {
+ var state = L.ui._login || (L.ui._login = {
form: $('<form />')
.attr('target', '')
.attr('method', 'post')
.append($('<p />')
.addClass('alert-message')
- .text(_luci2.tr('Wrong username or password given!')))
+ .text(L.tr('Wrong username or password given!')))
.append($('<p />')
.append($('<label />')
- .text(_luci2.tr('Username'))
+ .text(L.tr('Username'))
.append($('<br />'))
.append($('<input />')
.attr('type', 'text')
}))))
.append($('<p />')
.append($('<label />')
- .text(_luci2.tr('Password'))
+ .text(L.tr('Password'))
.append($('<br />'))
.append($('<input />')
.attr('type', 'password')
state.confirm_cb();
}))))
.append($('<p />')
- .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')))),
response_cb: function(response) {
if (!response.ubus_rpc_session)
{
- _luci2.ui.login(true);
+ L.ui.login(true);
}
else
{
- _luci2.globals.sid = response.ubus_rpc_session;
- _luci2.setHash('id', _luci2.globals.sid);
- _luci2.session.startHeartbeat();
- _luci2.ui.dialog(false);
+ L.globals.sid = response.ubus_rpc_session;
+ L.setHash('id', L.globals.sid);
+ L.session.startHeartbeat();
+ L.ui.dialog(false);
state.deferred.resolve();
}
},
if (!u)
return;
- _luci2.ui.dialog(
- _luci2.tr('Logging in'), [
- $('<p />').text(_luci2.tr('Log in in progress …')),
+ L.ui.dialog(
+ L.tr('Logging in'), [
+ $('<p />').text(L.tr('Log in in progress …')),
$('<div />')
.css('width', '100%')
.addClass('progressbar')
], { style: 'wait' }
);
- _luci2.globals.sid = '00000000000000000000000000000000';
- _luci2.session.login(u, p).then(state.response_cb);
+ L.globals.sid = '00000000000000000000000000000000';
+ L.session.login(u, p).then(state.response_cb);
}
});
state.deferred = $.Deferred();
/* try to find sid from hash */
- var sid = _luci2.getHash('id');
+ var sid = L.getHash('id');
if (sid && sid.match(/^[a-f0-9]{32}$/))
{
- _luci2.globals.sid = sid;
- _luci2.session.isAlive().then(function(access) {
+ L.globals.sid = sid;
+ L.session.isAlive().then(function(access) {
if (access)
{
- _luci2.session.startHeartbeat();
+ L.session.startHeartbeat();
state.deferred.resolve();
}
else
{
- _luci2.setHash('id', undefined);
- _luci2.ui.login();
+ L.setHash('id', undefined);
+ L.ui.login();
}
});
else
state.form.find('.alert-message').hide();
- _luci2.ui.dialog(_luci2.tr('Authorization Required'), state.form, {
+ L.ui.dialog(L.tr('Authorization Required'), state.form, {
style: 'confirm',
confirm: state.confirm_cb
});
return state.deferred;
},
- cryptPassword: _luci2.rpc.declare({
+ cryptPassword: L.rpc.declare({
object: 'luci2.ui',
method: 'crypt',
params: [ 'data' ],
}),
- _acl_merge_scope: function(acl_scope, scope)
+ mergeACLScope: function(acl_scope, scope)
{
if ($.isArray(scope))
{
}
},
- _acl_merge_permission: function(acl_perm, perm)
+ mergeACLPermission: 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]);
+ L.ui.mergeACLScope(acl_scope, perm[scope_name]);
}
}
},
- _acl_merge_group: function(acl_group, group)
+ mergeACLGroup: function(acl_group, group)
{
if ($.isPlainObject(group))
{
if (group.read)
{
var acl_perm = acl_group.read || (acl_group.read = { });
- this._acl_merge_permission(acl_perm, group.read);
+ L.ui.mergeACLPermission(acl_perm, group.read);
}
if (group.write)
{
var acl_perm = acl_group.write || (acl_group.write = { });
- this._acl_merge_permission(acl_perm, group.write);
+ L.ui.mergeACLPermission(acl_perm, group.write);
}
}
},
- _acl_merge_tree: function(acl_tree, tree)
+ callACLsCallback: function(trees)
{
- if ($.isPlainObject(tree))
+ var acl_tree = { };
+
+ for (var i = 0; i < trees.length; i++)
{
- for (var group_name in tree)
+ if (!$.isPlainObject(trees[i]))
+ continue;
+
+ for (var group_name in trees[i])
{
var acl_group = acl_tree[group_name] || (acl_tree[group_name] = { });
- this._acl_merge_group(acl_group, tree[group_name]);
+ L.ui.mergeACLGroup(acl_group, trees[i][group_name]);
}
}
+
+ return acl_tree;
},
- listAvailableACLs: _luci2.rpc.declare({
+ callACLs: L.rpc.declare({
object: 'luci2.ui',
method: 'acls',
- expect: { acls: [ ] },
- filter: function(trees) {
- var acl_tree = { };
- for (var i = 0; i < trees.length; i++)
- _luci2.ui._acl_merge_tree(acl_tree, trees[i]);
- return acl_tree;
- }
+ expect: { acls: [ ] }
}),
- _render_change_indicator: function()
+ getAvailableACLs: function()
+ {
+ return this.callACLs().then(this.callACLsCallback);
+ },
+
+ renderChangeIndicator: function()
{
return $('<ul />')
.addClass('nav navbar-nav navbar-right')
.addClass('label label-info'))));
},
- renderMainMenu: _luci2.rpc.declare({
+ callMenuCallback: function(entries)
+ {
+ L.globals.mainMenu = new L.ui.menu();
+ L.globals.mainMenu.entries(entries);
+
+ $('#mainmenu')
+ .empty()
+ .append(L.globals.mainMenu.render(0, 1))
+ .append(L.ui.renderChangeIndicator());
+ },
+
+ callMenu: L.rpc.declare({
object: 'luci2.ui',
method: 'menu',
- expect: { menu: { } },
- filter: function(entries) {
- _luci2.globals.mainMenu = new _luci2.ui.menu();
- _luci2.globals.mainMenu.entries(entries);
-
- $('#mainmenu')
- .empty()
- .append(_luci2.globals.mainMenu.render(0, 1))
- .append(_luci2.ui._render_change_indicator());
- }
+ expect: { menu: { } }
}),
+ renderMainMenu: function()
+ {
+ return this.callMenu().then(this.callMenuCallback);
+ },
+
renderViewMenu: function()
{
$('#viewmenu')
.empty()
- .append(_luci2.globals.mainMenu.render(2, 900));
+ .append(L.globals.mainMenu.render(2, 900));
},
renderView: function()
{
var node = arguments[0];
var name = node.view.split(/\//).join('.');
- var cname = _luci2.toClassName(name);
- var views = _luci2.views || (_luci2.views = { });
+ var cname = L.toClassName(name);
+ var views = L.views || (L.views = { });
var args = [ ];
for (var i = 1; i < arguments.length; i++)
args.push(arguments[i]);
- if (_luci2.globals.currentView)
- _luci2.globals.currentView.finish();
+ if (L.globals.currentView)
+ L.globals.currentView.finish();
- _luci2.ui.renderViewMenu();
- _luci2.setHash('view', node.view);
+ L.ui.renderViewMenu();
+ L.setHash('view', node.view);
- if (views[cname] instanceof _luci2.ui.view)
+ if (views[cname] instanceof L.ui.view)
{
- _luci2.globals.currentView = views[cname];
+ L.globals.currentView = views[cname];
return views[cname].render.apply(views[cname], args);
}
- var url = _luci2.globals.resource + '/view/' + name + '.js';
+ var url = L.globals.resource + '/view/' + name + '.js';
return $.ajax(url, {
method: 'GET',
var viewConstructorSource = (
'(function(L, $) { ' +
'return %s' +
- '})(_luci2, $);\n\n' +
+ '})(L, $);\n\n' +
'//@ sourceURL=%s'
).format(data, url);
acls: node.write || { }
});
- _luci2.globals.currentView = views[cname];
+ L.globals.currentView = views[cname];
return views[cname].render.apply(views[cname], args);
}
catch(e) {
changeView: function()
{
- var name = _luci2.getHash('view');
- var node = _luci2.globals.defaultNode;
+ var name = L.getHash('view');
+ var node = L.globals.defaultNode;
- if (name && _luci2.globals.mainMenu)
- node = _luci2.globals.mainMenu.getNode(name);
+ if (name && L.globals.mainMenu)
+ node = L.globals.mainMenu.getNode(name);
if (node)
{
- _luci2.ui.loading(true);
- _luci2.ui.renderView(node).then(function() {
- _luci2.ui.loading(false);
+ L.ui.loading(true);
+ L.ui.renderView(node).then(function() {
+ L.ui.loading(false);
});
}
},
updateHostname: function()
{
- return _luci2.system.getBoardInfo().then(function(info) {
+ return L.system.getBoardInfo().then(function(info) {
if (info.hostname)
$('#hostname').text(info.hostname);
});
updateChanges: function()
{
- return _luci2.uci.changes().then(function(changes) {
+ return L.uci.changes().then(function(changes) {
var n = 0;
var html = '';
if (n > 0)
$('#changes')
.click(function(ev) {
- _luci2.ui.dialog(_luci2.tr('Staged configuration changes'), html, {
+ L.ui.dialog(L.tr('Staged configuration changes'), html, {
style: 'confirm',
confirm: function() {
- _luci2.uci.apply().then(
+ L.uci.apply().then(
function(code) { alert('Success with code ' + code); },
function(code) { alert('Error with code ' + code); }
);
})
.children('span')
.show()
- .text(_luci2.trcp('Pending configuration changes', '1 change', '%d changes', n).format(n));
+ .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.session.updateACLs(),
- _luci2.ui.updateHostname(),
- _luci2.ui.updateChanges(),
- _luci2.ui.renderMainMenu(),
- _luci2.NetworkModel.init()
+ 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() {
- _luci2.ui.changeView();
+ L.ui.changeView();
});
});
},
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 = 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',
return '';
case ':':
- return _luci2.tr(p2);
+ return L.tr(p2);
case '=':
- return _luci2.globals[p2] || '';
+ return L.globals[p2] || '';
default:
return '(?' + match + ')';
args.push(arguments[i]);
return this._fetch_template().then(function() {
- return _luci2.deferrable(self.execute.apply(self, args));
+ return L.deferrable(self.execute.apply(self, args));
});
},
};
runTimer = function() {
- _luci2.deferrable(func.call(self)).then(setTimer, setTimer);
+ L.deferrable(func.call(self)).then(setTimer, setTimer);
};
runTimer();
}
},
- _indexcmp: function(a, b)
+ sortNodesCallback: function(a, b)
{
var x = a.index || 0;
var y = b.index || 0;
for (var child in (node.childs || { }))
nodes.push(node.childs[child]);
- nodes.sort(this._indexcmp);
+ nodes.sort(this.sortNodesCallback);
for (var i = 0; i < nodes.length; i++)
{
return undefined;
},
- _onclick: function(ev)
+ handleClick: function(ev)
{
- _luci2.setHash('view', ev.data);
+ L.setHash('view', ev.data);
ev.preventDefault();
this.blur();
},
- _render: function(childs, level, min, max)
+ renderNodes: function(childs, level, min, max)
{
var nodes = [ ];
for (var node in childs)
nodes.push(childs[node]);
}
- nodes.sort(this._indexcmp);
+ nodes.sort(this.sortNodesCallback);
var list = $('<ul />');
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 = $('<li />')
.append($('<a />')
.attr('href', '#')
- .text(_luci2.tr(nodes[i].title)))
+ .text(L.tr(nodes[i].title)))
.appendTo(list);
if (nodes[i].childs && level < max)
.attr('data-toggle', 'dropdown')
.append('<b class="caret"></b>');
- item.append(this._render(nodes[i].childs, level + 1));
+ item.append(this.renderNodes(nodes[i].childs, level + 1));
}
else
{
- item.find('a').click(nodes[i].view, this._onclick);
+ item.find('a').click(nodes[i].view, this.handleClick);
}
}
render: function(min, max)
{
- var top = min ? this.getNode(_luci2.globals.defaultNode.view, min) : this._nodes;
- return this._render(top.childs, 0, min, max);
+ var top = min ? this.getNode(L.globals.defaultNode.view, min) : this._nodes;
+ return this.renderNodes(top.childs, 0, min, max);
},
getNode: function(path, max)
}
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 (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;
}
validation: {
i18n: function(msg)
{
- _luci2.cbi.validation.message = _luci2.tr(msg);
+ L.cbi.validation.message = L.tr(msg);
},
compile: function(code)
var pos = 0;
var esc = false;
var depth = 0;
- var types = _luci2.cbi.validation.types;
+ var types = L.cbi.validation.types;
var stack = [ ];
code += ',';
throw "Syntax error, argument list follows non-function";
stack[stack.length-1] =
- _luci2.cbi.validation.compile(code.substring(pos, i));
+ L.cbi.validation.compile(code.substring(pos, i));
pos = i+1;
}
'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');
'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;
'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;
+ },
- for (var i = 0; i < (7 - colons); i++)
- fill += ':0';
+ 'cidr6': function()
+ {
+ if (this.match(/^([a-fA-F0-9:.]+)\/(\d{1,3})$/))
+ if (RegExp.$2 <= 128 && L.parseIPv6(RegExp.$1))
+ return true;
- if (addr.match(/^(.*?)::(.*?)$/))
- addr = (RegExp.$1 ? RegExp.$1 + ':' : '') + fill +
- (RegExp.$2 ? ':' + RegExp.$2 : '');
- }
+ validation.i18n('Must be a valid IPv6 prefix');
+ return false;
+ },
- if (addr.match(/^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/) != null)
- return true;
+ '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;
+ }
- validation.i18n('Must be a valid IPv6 address');
- return false;
- }
+ validation.i18n('Must be a valid IPv4 address/netmask pair');
+ 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');
+ validation.i18n('Must be a valid IPv6 address/netmask pair');
return false;
},
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;
},
this.instance = { };
this.dependencies = [ ];
this.rdependency = { };
- this.events = { };
- this.options = _luci2.defaults(options, {
+ this.options = L.defaults(options, {
placeholder: '',
datatype: 'string',
optional: false,
id: function(sid)
{
- return this.section.id('field', sid || '__unknown__', this.name);
+ return this.ownerSection.id('field', sid || '__unknown__', this.name);
},
render: function(sid, condensed)
{
var i = this.instance[sid] = { };
- i.top = $('<div />');
+ i.top = $('<div />')
+ .addClass('luci2-field');
if (!condensed)
{
i.error = $('<div />')
.hide()
- .addClass('label label-danger');
+ .addClass('luci2-field-error label label-danger');
i.widget = $('<div />')
-
+ .addClass('luci2-field-widget')
.append(this.widget(sid))
.append(i.error)
.appendTo(i.top);
ucipath: function(sid)
{
return {
- config: (this.options.uci_package || this.map.uci_package),
+ config: (this.options.uci_package || this.ownerMap.uci_package),
section: (this.options.uci_section || sid),
option: (this.options.uci_option || this.name)
};
ucivalue: function(sid)
{
var uci = this.ucipath(sid);
- var val = this.map.get(uci.config, uci.section, uci.option);
+ var val = this.ownerMap.get(uci.config, uci.section, uci.option);
if (typeof(val) == 'undefined')
return this.options.initial;
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(', ');
if (typeof(a) != typeof(b))
return true;
- if (typeof(a) == 'object')
+ if ($.isArray(a))
{
if (a.length != b.length)
return true;
return false;
}
+ else if ($.isPlainObject(a))
+ {
+ for (var k in a)
+ if (!(k in b))
+ return true;
+
+ for (var k in b)
+ if (!(k in a) || a[k] !== b[k])
+ return true;
+
+ return false;
+ }
return (a != b);
},
if (this.instance[sid].disabled)
{
if (!this.options.keep)
- return this.map.set(uci.config, uci.section, uci.option, undefined);
+ return this.ownerMap.set(uci.config, uci.section, uci.option, undefined);
return false;
}
var val = this.formvalue(sid);
if (chg)
- this.map.set(uci.config, uci.section, uci.option, val);
+ this.ownerMap.set(uci.config, uci.section, uci.option, val);
return chg;
},
- _ev_validate: function(ev)
+ findSectionID: function($elem)
+ {
+ return this.ownerSection.findParentSectionIDs($elem)[0];
+ },
+
+ setError: function($elem, msg, msgargs)
+ {
+ var $field = $elem.parents('.luci2-field:first');
+ var $error = $field.find('.luci2-field-error:first');
+
+ if (typeof(msg) == 'string' && msg.length > 0)
+ {
+ $field.addClass('luci2-form-error');
+ $elem.parent().addClass('has-error');
+
+ $error.text(msg.format.apply(msg, msgargs)).show();
+ $field.trigger('validate');
+
+ return false;
+ }
+ else
+ {
+ $elem.parent().removeClass('has-error');
+
+ var $other_errors = $field.find('.has-error');
+ if ($other_errors.length == 0)
+ {
+ $field.removeClass('luci2-form-error');
+ $error.text('').hide();
+ $field.trigger('validate');
+
+ return true;
+ }
+
+ return false;
+ }
+ },
+
+ handleValidate: function(ev)
{
+ var $elem = $(this);
+
var d = ev.data;
var rv = true;
- var val = d.elem.val();
+ var val = $elem.val();
var vstack = d.vstack;
if (vstack && typeof(vstack[0]) == 'function')
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(_luci2.tr('Field must not be empty')).show();
- rv = false;
+ rv = d.self.setError($elem, L.tr('Field must not be empty'));
}
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;
+ rv = d.self.setError($elem, validation.message, vstack[1]);
}
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();
+ rv = d.self.setError($elem);
}
}
if (rv)
{
+ var sid = d.self.findSectionID($elem);
+
for (var field in d.self.rdependency)
- d.self.rdependency[field].toggle(d.sid);
+ {
+ d.self.rdependency[field].toggle(sid);
+ d.self.rdependency[field].validate(sid);
+ }
- d.self.section.tabtoggle(d.sid);
+ d.self.ownerSection.tabtoggle(sid);
}
return rv;
},
- validator: function(sid, elem, multi)
+ attachEvents: function(sid, elem)
{
var evdata = {
self: this,
- sid: sid,
- elem: elem,
- multi: multi,
- inst: this.instance[sid],
opt: this.options.optional
};
- for (var evname in this.events)
- elem.on(evname, evdata, this.events[evname]);
+ 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;
if (typeof(this.options.datatype) == 'string')
{
try {
- evdata.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')
if (elem.prop('tagName') == 'SELECT')
{
- elem.change(evdata, this._ev_validate);
+ elem.change(evdata, this.handleValidate);
}
else if (elem.prop('tagName') == 'INPUT' && elem.attr('type') == 'checkbox')
{
- elem.click(evdata, this._ev_validate);
- elem.blur(evdata, this._ev_validate);
+ elem.click(evdata, this.handleValidate);
+ elem.blur(evdata, this.handleValidate);
}
else
{
- elem.keyup(evdata, this._ev_validate);
- elem.blur(evdata, this._ev_validate);
+ elem.keyup(evdata, this.handleValidate);
+ elem.blur(evdata, this.handleValidate);
}
- elem.attr('cbi-validate', true).on('validate', evdata, this._ev_validate);
+ elem.addClass('luci2-field-validate')
+ .on('validate', evdata, this.handleValidate);
return elem;
},
{
var i = this.instance[sid];
- i.widget.find('[cbi-validate]').trigger('validate');
+ i.widget.find('.luci2-field-validate').trigger('validate');
return (i.disabled || i.error.text() == '');
},
{
if (typeof(d[i]) == 'string')
dep[d[i]] = true;
- else if (d[i] instanceof _luci2.cbi.AbstractValue)
+ else if (d[i] instanceof L.cbi.AbstractValue)
dep[d[i].name] = true;
}
}
- else if (d instanceof _luci2.cbi.AbstractValue)
+ else if (d instanceof L.cbi.AbstractValue)
{
dep = { };
dep[d.name] = (typeof(v) == 'undefined') ? true : v;
for (var field in dep)
{
- var f = this.section.fields[field];
+ var f = this.ownerSection.fields[field];
if (f)
f.rdependency[this.name] = this;
else
for (var field in d[n])
{
- var val = this.section.fields[field].formvalue(sid);
+ var val = this.ownerSection.fields[field].formvalue(sid);
var cmp = d[n][field];
if (typeof(cmp) == 'boolean')
if (i.disabled)
{
i.disabled = false;
+ i.top.removeClass('luci2-field-disabled');
i.top.fadeIn();
}
{
i.disabled = true;
i.top.is(':visible') ? i.top.fadeOut() : i.top.hide();
+ i.top.addClass('luci2-field-disabled');
}
return false;
- },
-
- on: function(evname, evfunc)
- {
- this.events[evname] = evfunc;
- return this;
}
});
return $('<div />')
.addClass('checkbox')
- .append(this.validator(sid, i));
+ .append(this.attachEvents(sid, i));
},
ucivalue: function(sid)
if (this.instance[sid].disabled)
{
if (!this.options.keep)
- return this.map.set(uci.config, uci.section, uci.option, undefined);
+ return this.ownerMap.set(uci.config, uci.section, uci.option, undefined);
return false;
}
if (chg)
{
if (this.options.optional && val == this.options.initial)
- this.map.set(uci.config, uci.section, uci.option, undefined);
+ this.ownerMap.set(uci.config, uci.section, uci.option, undefined);
else
- this.map.set(uci.config, uci.section, uci.option, val ? this.options.enabled : this.options.disabled);
+ this.ownerMap.set(uci.config, uci.section, uci.option, val ? this.options.enabled : this.options.disabled);
}
return chg;
.attr('placeholder', this.options.placeholder)
.val(this.ucivalue(sid));
- return this.validator(sid, i);
+ return this.attachEvents(sid, i);
}
});
var t = $('<span />')
.addClass('input-group-btn')
- .append(_luci2.ui.button(_luci2.tr('Reveal'), 'default')
+ .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' ? _luci2.tr('Hide') : _luci2.tr('Reveal'));
+ 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);
+ this.attachEvents(sid, i);
return $('<div />')
.addClass('input-group')
var s = $('<select />')
.addClass('form-control');
- if (this.options.optional)
+ if (this.options.optional && !this.has_empty)
$('<option />')
.attr('value', '')
- .text(_luci2.tr('-- Please choose --'))
+ .text(L.tr('-- Please choose --'))
.appendTo(s);
if (this.choices)
s.attr('id', this.id(sid)).val(this.ucivalue(sid));
- return this.validator(sid, s);
+ return this.attachEvents(sid, s);
},
value: function(k, v)
if (!this.choices)
this.choices = [ ];
+ if (k == '')
+ this.has_empty = true;
+
this.choices.push([k, v || k]);
return this;
}
{
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)
{
{
ev.data.input.val(ev.data.select.val());
}
+
+ ev.stopPropagation();
},
_blur: function(ev)
ev.data.select.empty();
- if (self.options.optional)
+ if (self.options.optional && !self.has_empty)
$('<option />')
.attr('value', '')
- .text(_luci2.tr('-- please choose --'))
+ .text(L.tr('-- please choose --'))
.appendTo(ev.data.select);
if (self.choices)
$('<option />')
.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)
.attr('id', this.id(sid));
var t = $('<input />')
+ .addClass('form-control')
.attr('type', 'text')
.hide()
.appendTo(d);
var s = $('<select />')
+ .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);
t.val(this.ucivalue(sid));
t.blur();
+ this.attachEvents(sid, t);
+ this.attachEvents(sid, s);
+
return d;
},
if (!this.choices)
this.choices = [ ];
+ if (k == '')
+ this.has_empty = true;
+
this.choices.push([k, v || k]);
return this;
},
var btn;
if (evdata.remove)
- btn = _luci2.ui.button('–', 'danger').click(evdata, this._btnclick);
+ btn = L.ui.button('–', 'danger').click(evdata, this._btnclick);
else
- btn = _luci2.ui.button('+', 'success').click(evdata, this._btnclick);
+ btn = L.ui.button('+', 'success').click(evdata, this._btnclick);
if (this.choices)
{
.append(btn))
.appendTo(s.parent);
- evdata.input = this.validator(s.sid, txt, true);
- evdata.select = this.validator(s.sid, sel, true);
+ evdata.input = this.attachEvents(s.sid, txt);
+ evdata.select = this.attachEvents(s.sid, sel);
sel.change(evdata, this._change);
txt.blur(evdata, this._blur);
f.val(val);
}
- evdata.input = this.validator(s.sid, f, true);
+ evdata.input = this.attachEvents(s.sid, f);
f = null;
}
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)
return $('<div />')
.addClass('form-control-static')
.attr('id', this.id(sid))
- .html(this.ucivalue(sid));
+ .html(this.ucivalue(sid) || this.label('placeholder'));
},
formvalue: function(sid)
.attr('type', 'button')
.text(this.label('text'));
- return this.validator(sid, btn);
+ return this.attachEvents(sid, btn);
}
});
this.cbi.NetworkList = this.cbi.AbstractValue.extend({
load: function(sid)
{
- return _luci2.NetworkModel.init();
+ return L.NetworkModel.init();
},
_device_icon: function(dev)
for (var i = 0; i < value.length; i++)
check[value[i]] = true;
- var interfaces = _luci2.NetworkModel.getInterfaces();
+ var interfaces = L.NetworkModel.getInterfaces();
for (var i = 0; i < interfaces.length; i++)
{
var iface = interfaces[i];
- var badge = $('<span />')
- .addClass('badge')
- .text('%s: '.format(iface.name()));
-
- var dev = iface.getDevice();
- var subdevs = iface.getSubdevices();
-
- if (subdevs.length)
- for (var j = 0; j < subdevs.length; j++)
- badge.append(this._device_icon(subdevs[j]));
- else if (dev)
- badge.append(this._device_icon(dev));
- else
- badge.append($('<em />').text(_luci2.tr('(No devices attached)')));
$('<li />')
.append($('<label />')
.addClass(itype + ' inline')
- .append($('<input />')
+ .append(this.attachEvents(sid, $('<input />')
.attr('name', itype + id)
.attr('type', itype)
.attr('value', iface.name())
- .prop('checked', !!check[iface.name()]))
- .append(badge))
+ .prop('checked', !!check[iface.name()])))
+ .append(iface.renderBadge()))
.appendTo(ul);
}
$('<li />')
.append($('<label />')
.addClass(itype + ' inline text-muted')
- .append($('<input />')
+ .append(this.attachEvents(sid, $('<input />')
.attr('name', itype + id)
.attr('type', itype)
.attr('value', '')
- .prop('checked', $.isEmptyObject(check)))
- .append(_luci2.tr('unspecified')))
+ .prop('checked', $.isEmptyObject(check))))
+ .append(L.tr('unspecified')))
.appendTo(ul);
}
}
});
+ this.cbi.DeviceList = this.cbi.NetworkList.extend({
+ handleFocus: function(ev)
+ {
+ var self = ev.data.self;
+ var input = $(this);
+
+ input.parent().prev().prop('checked', true);
+ },
+
+ handleBlur: function(ev)
+ {
+ ev.which = 10;
+ ev.data.self.handleKeydown.call(this, ev);
+ },
+
+ handleKeydown: 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 = $('<span />')
+ .addClass('badge')
+ .append($('<img />').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(')');
+ //}
+
+ $('<li />')
+ .append($('<label />')
+ .addClass(itype + ' inline')
+ .append($('<input />')
+ .attr('name', itype + id)
+ .attr('type', itype)
+ .attr('value', dev.name())
+ .prop('checked', !!check[dev.name()]))
+ .append(badge))
+ .appendTo(ul);
+ }
+
+
+ $('<li />')
+ .append($('<label />')
+ .attr('for', 'custom' + id)
+ .addClass(itype + ' inline')
+ .append($('<input />')
+ .attr('name', itype + id)
+ .attr('type', itype)
+ .attr('value', ''))
+ .append($('<span />')
+ .addClass('badge')
+ .append($('<input />')
+ .attr('id', 'custom' + id)
+ .attr('type', 'text')
+ .attr('placeholder', L.tr('Custom device …'))
+ .on('focus', { self: this, sid: sid }, this.handleFocus)
+ .on('blur', { self: this, sid: sid }, this.handleBlur)
+ .on('keydown', { self: this, sid: sid }, this.handleKeydown))))
+ .appendTo(ul);
+
+ if (!this.options.multiple)
+ {
+ $('<li />')
+ .append($('<label />')
+ .addClass(itype + ' inline text-muted')
+ .append($('<input />')
+ .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 = $('<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 ]);
+ }
+ });
+
this.cbi.AbstractSection = this.ui.AbstractWidget.extend({
id: function()
{
- var s = [ arguments[0], this.map.uci_package, this.uci_type ];
+ var s = [ arguments[0], this.ownerMap.uci_package, this.uci_type ];
- for (var i = 1; i < arguments.length; i++)
+ for (var i = 1; i < arguments.length && typeof(arguments[i]) == 'string'; i++)
s.push(arguments[i].replace(/\./g, '_'));
return s.join('_');
var w = widget ? new widget(name, options) : null;
- if (!(w instanceof _luci2.cbi.AbstractValue))
+ if (!(w instanceof L.cbi.AbstractValue))
throw 'Widget must be an instance of AbstractValue';
- w.section = this;
- w.map = this.map;
+ w.ownerSection = this;
+ w.ownerMap = this.ownerMap;
this.fields[name] = w;
tab.fields.push(w);
}
},
- ucipackages: function(pkg)
+ validate: function(parent_sid)
{
- for (var i = 0; i < this.tabs.length; i++)
- for (var j = 0; j < this.tabs[i].fields.length; j++)
- if (this.tabs[i].fields[j].options.uci_package)
- pkg[this.tabs[i].fields[j].options.uci_package] = true;
+ var s = this.getUCISections(parent_sid);
+ var n = 0;
+
+ for (var i = 0; i < s.length; i++)
+ {
+ var $item = $('#' + this.id('sectionitem', s[i]['.name']));
+
+ $item.find('.luci2-field-validate').trigger('validate');
+ n += $item.find('.luci2-field.luci2-form-error').not('.luci2-field-disabled').length;
+ }
+
+ return (n == 0);
},
- formvalue: function()
+ load: function(parent_sid)
{
- var rv = { };
+ var deferreds = [ ];
- this.sections(function(s) {
- var sid = s['.name'];
- var sv = rv[sid] || (rv[sid] = { });
+ var s = this.getUCISections(parent_sid);
+ for (var i = 0; i < s.length; i++)
+ {
+ for (var f in this.fields)
+ {
+ if (typeof(this.fields[f].load) != 'function')
+ continue;
- for (var i = 0; i < this.tabs.length; i++)
- for (var j = 0; j < this.tabs[i].fields.length; j++)
+ var rv = this.fields[f].load(s[i]['.name']);
+ if (L.isDeferred(rv))
+ deferreds.push(rv);
+ }
+
+ for (var j = 0; j < this.subsections.length; j++)
+ {
+ var rv = this.subsections[j].load(s[i]['.name']);
+ deferreds.push.apply(deferreds, rv);
+ }
+ }
+
+ return deferreds;
+ },
+
+ save: function(parent_sid)
+ {
+ var deferreds = [ ];
+ var s = this.getUCISections(parent_sid);
+
+ for (i = 0; i < s.length; i++)
+ {
+ if (!this.options.readonly)
+ {
+ for (var f in this.fields)
{
- var val = this.tabs[i].fields[j].formvalue(sid);
- sv[this.tabs[i].fields[j].name] = val;
+ if (typeof(this.fields[f].save) != 'function')
+ continue;
+
+ var rv = this.fields[f].save(s[i]['.name']);
+ if (L.isDeferred(rv))
+ deferreds.push(rv);
}
- });
+ }
- return rv;
+ for (var j = 0; j < this.subsections.length; j++)
+ {
+ var rv = this.subsections[j].save(s[i]['.name']);
+ deferreds.push.apply(deferreds, rv);
+ }
+ }
+
+ return deferreds;
},
- validate_section: function(sid)
+ teaser: function(sid)
{
- var inst = this.instance[sid];
+ var tf = this.teaser_fields;
- var invals = 0;
- var badge = $('#' + this.id('teaser', sid)).children('span:first');
+ if (!tf)
+ {
+ tf = this.teaser_fields = [ ];
- for (var i = 0; i < this.tabs.length; i++)
+ if ($.isArray(this.options.teasers))
+ {
+ for (var i = 0; i < this.options.teasers.length; i++)
+ {
+ var f = this.options.teasers[i];
+ if (f instanceof L.cbi.AbstractValue)
+ tf.push(f);
+ else if (typeof(f) == 'string' && this.fields[f] instanceof L.cbi.AbstractValue)
+ tf.push(this.fields[f]);
+ }
+ }
+ else
+ {
+ for (var i = 0; tf.length <= 5 && i < this.tabs.length; i++)
+ for (var j = 0; tf.length <= 5 && j < this.tabs[i].fields.length; j++)
+ tf.push(this.tabs[i].fields[j]);
+ }
+ }
+
+ var t = '';
+
+ for (var i = 0; i < tf.length; i++)
{
- var inval = 0;
- var stbadge = $('#' + this.id('nodetab', sid, this.tabs[i].id)).children('span:first');
+ if (tf[i].instance[sid] && tf[i].instance[sid].disabled)
+ continue;
- for (var j = 0; j < this.tabs[i].fields.length; j++)
- if (!this.tabs[i].fields[j].validate(sid))
- inval++;
+ var n = tf[i].options.caption || tf[i].name;
+ var v = tf[i].textvalue(sid);
- if (inval > 0)
- stbadge.show()
- .text(inval)
- .attr('title', _luci2.trp('1 Error', '%d Errors', inval).format(inval));
- else
- stbadge.hide();
+ if (typeof(v) == 'undefined')
+ continue;
- invals += inval;
+ t = t + '%s%s: <strong>%s</strong>'.format(t ? ' | ' : '', n, v);
}
- if (invals > 0)
- badge.show()
- .text(invals)
- .attr('title', _luci2.trp('1 Error', '%d Errors', invals).format(invals));
- else
- badge.hide();
-
- return invals;
+ return t;
},
- validate: function()
+ findAdditionalUCIPackages: function()
{
- var errors = 0;
- var as = this.sections();
+ var packages = [ ];
- for (var i = 0; i < as.length; i++)
- {
- var invals = this.validate_section(as[i]['.name']);
+ for (var i = 0; i < this.tabs.length; i++)
+ for (var j = 0; j < this.tabs[i].fields.length; j++)
+ if (this.tabs[i].fields[j].options.uci_package)
+ packages.push(this.tabs[i].fields[j].options.uci_package);
- if (invals > 0)
- errors += invals;
- }
+ return packages;
+ },
- var badge = $('#' + this.id('sectiontab')).children('span:first');
+ findParentSectionIDs: function($elem)
+ {
+ var rv = [ ];
+ var $parents = $elem.parents('.luci2-section-item');
- if (errors > 0)
- badge.show()
- .text(errors)
- .attr('title', _luci2.trp('1 Error', '%d Errors', errors).format(errors));
- else
- badge.hide();
+ for (var i = 0; i < $parents.length; i++)
+ rv.push($parents[i].getAttribute('data-luci2-sid'));
- return (errors == 0);
+ return rv;
}
});
this.options = options;
this.tabs = [ ];
this.fields = { };
- this.active_panel = 0;
+ this.subsections = [ ];
+ this.active_panel = { };
this.active_tab = { };
+
+ this.instance = { };
},
- filter: function(section)
+ filter: function(section, parent_sid)
{
return true;
},
- sections: function(cb)
+ sort: function(section1, section2)
+ {
+ return 0;
+ },
+
+ subsection: function(widget, uci_type, options)
{
- var s1 = _luci2.uci.sections(this.map.uci_package);
+ var w = widget ? new widget(uci_type, options) : null;
+
+ if (!(w instanceof L.cbi.AbstractSection))
+ throw 'Widget must be an instance of AbstractSection';
+
+ w.ownerSection = this;
+ w.ownerMap = this.ownerMap;
+ w.index = this.subsections.length;
+
+ this.subsections.push(w);
+ return w;
+ },
+
+ getUCISections: function(parent_sid)
+ {
+ var s1 = L.uci.sections(this.ownerMap.uci_package);
var s2 = [ ];
for (var i = 0; i < s1.length; i++)
if (s1[i]['.type'] == this.uci_type)
- if (this.filter(s1[i]))
+ if (this.filter(s1[i], parent_sid))
s2.push(s1[i]);
- if (typeof(cb) == 'function')
- for (var i = 0; i < s2.length; i++)
- cb.apply(this, [ s2[i] ]);
+ s2.sort(this.sort);
return s2;
},
- add: function(name)
+ add: function(name, parent_sid)
{
- this.map.add(this.map.uci_package, this.uci_type, name);
+ return this.ownerMap.add(this.ownerMap.uci_package, this.uci_type, name);
},
- remove: function(sid)
+ remove: function(sid, parent_sid)
{
- this.map.remove(this.map.uci_package, sid);
+ return this.ownerMap.remove(this.ownerMap.uci_package, sid);
},
- _ev_add: function(ev)
+ handleAdd: function(ev)
{
var addb = $(this);
var name = undefined;
var self = ev.data.self;
+ var sid = self.findParentSectionIDs(addb)[0];
if (addb.prev().prop('nodeName') == 'INPUT')
name = addb.prev().val();
if (addb.prop('disabled') || name === '')
return;
- _luci2.ui.saveScrollTop();
+ L.ui.saveScrollTop();
- self.active_panel = -1;
- self.map.save();
- self.add(name);
- self.map.redraw();
+ self.setPanelIndex(sid, -1);
+ self.ownerMap.save();
- _luci2.ui.restoreScrollTop();
+ ev.data.sid = self.add(name, sid);
+ ev.data.type = self.uci_type;
+ ev.data.name = name;
+
+ self.trigger('add', ev);
+
+ self.ownerMap.redraw();
+
+ L.ui.restoreScrollTop();
},
- _ev_remove: function(ev)
+ handleRemove: function(ev)
{
var self = ev.data.self;
- var sid = ev.data.sid;
+ var sids = self.findParentSectionIDs($(this));
- _luci2.ui.saveScrollTop();
+ if (sids.length)
+ {
+ L.ui.saveScrollTop();
+
+ ev.sid = sids[0];
+ ev.parent_sid = sids[1];
- self.map.save();
- self.remove(sid);
- self.map.redraw();
+ self.trigger('remove', ev);
- _luci2.ui.restoreScrollTop();
+ self.ownerMap.save();
+ self.remove(ev.sid, ev.parent_sid);
+ self.ownerMap.redraw();
+
+ L.ui.restoreScrollTop();
+ }
ev.stopPropagation();
},
- _ev_sid: function(ev)
+ handleSID: function(ev)
{
var self = ev.data.self;
var text = $(this);
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;
}
- if (_luci2.uci.get(self.map.uci_package, name))
+ if (L.uci.get(self.ownerMap.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;
return true;
},
- _ev_tab: function(ev)
+ handleTab: function(ev)
{
var self = ev.data.self;
- var sid = ev.data.sid;
+ var $tab = $(this);
+ var sid = self.findParentSectionIDs($tab)[0];
+
+ self.active_tab[sid] = $tab.parent().index();
+ },
- self.validate();
- self.active_tab[sid] = parseInt(ev.target.getAttribute('data-luci2-tab-index'));
+ handleTabValidate: function(ev)
+ {
+ var $pane = $(ev.delegateTarget);
+ var $badge = $pane.parent()
+ .children('.nav-tabs')
+ .children('li')
+ .eq($pane.index() - 1) // item #1 is the <ul>
+ .find('.badge:first');
+
+ var err_count = $pane.find('.luci2-field.luci2-form-error').not('.luci2-field-disabled').length;
+ if (err_count > 0)
+ $badge
+ .text(err_count)
+ .attr('title', L.trp('1 Error', '%d Errors', err_count).format(err_count))
+ .show();
+ else
+ $badge.hide();
+ },
+
+ handlePanelValidate: function(ev)
+ {
+ var $elem = $(this);
+ var $badge = $elem
+ .prevAll('.luci2-section-header:first')
+ .children('.luci2-section-teaser')
+ .find('.badge:first');
+
+ var err_count = $elem.find('.luci2-field.luci2-form-error').not('.luci2-field-disabled').length;
+ if (err_count > 0)
+ $badge
+ .text(err_count)
+ .attr('title', L.trp('1 Error', '%d Errors', err_count).format(err_count))
+ .show();
+ else
+ $badge.hide();
},
- _ev_panel_collapse: function(ev)
+ handlePanelCollapse: function(ev)
{
var self = ev.data.self;
- var this_panel = $(ev.target);
- var this_toggle = this_panel.prevAll('[data-toggle="collapse"]:first');
+ var $items = $(ev.delegateTarget).children('.luci2-section-item');
- var prev_toggle = $($(ev.delegateTarget).find('[data-toggle="collapse"]:eq(%d)'.format(self.active_panel)));
- var prev_panel = $(prev_toggle.attr('data-target'));
+ var $this_panel = $(ev.target);
+ var $this_teaser = $this_panel.prevAll('.luci2-section-header:first').children('.luci2-section-teaser');
- prev_panel
+ var $prev_panel = $items.children('.luci2-section-panel.in');
+ var $prev_teaser = $prev_panel.prevAll('.luci2-section-header:first').children('.luci2-section-teaser');
+
+ var sids = self.findParentSectionIDs($prev_panel);
+
+ self.setPanelIndex(sids[1], $this_panel.parent().index());
+
+ $prev_panel
.removeClass('in')
.addClass('collapse');
- prev_toggle.find('.luci2-section-teaser')
+ $prev_teaser
.show()
.children('span:last')
.empty()
- .append(self.teaser(prev_panel.attr('data-luci2-sid')));
+ .append(self.teaser(sids[0]));
- this_toggle.find('.luci2-section-teaser')
+ $this_teaser
.hide();
- self.active_panel = parseInt(this_panel.attr('data-luci2-panel-index'));
- self.validate();
+ ev.stopPropagation();
},
- _ev_panel_open: function(ev)
+ handleSort: 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();
- },
+ var self = ev.data.self;
- _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();
+ var $item = $(this).parents('.luci2-section-item:first');
+ var $next = ev.data.up ? $item.prev() : $item.next();
- if (new_idx >= 0 && new_idx < s.length)
+ if ($item.length && $next.length)
{
- _luci2.uci.swap(self.map.uci_package, s[cur_idx]['.name'], s[new_idx]['.name']);
+ var cur_sid = $item.attr('data-luci2-sid');
+ var new_sid = $next.attr('data-luci2-sid');
+
+ L.uci.swap(self.ownerMap.uci_package, cur_sid, new_sid);
- self.map.save();
- self.map.redraw();
+ self.ownerMap.save();
+ self.ownerMap.redraw();
}
ev.stopPropagation();
},
- teaser: function(sid)
+ getPanelIndex: function(parent_sid)
{
- var tf = this.teaser_fields;
-
- if (!tf)
- {
- tf = this.teaser_fields = [ ];
-
- if ($.isArray(this.options.teasers))
- {
- for (var i = 0; i < this.options.teasers.length; i++)
- {
- var f = this.options.teasers[i];
- if (f instanceof _luci2.cbi.AbstractValue)
- tf.push(f);
- else if (typeof(f) == 'string' && this.fields[f] instanceof _luci2.cbi.AbstractValue)
- tf.push(this.fields[f]);
- }
- }
- else
- {
- for (var i = 0; tf.length <= 5 && i < this.tabs.length; i++)
- for (var j = 0; tf.length <= 5 && j < this.tabs[i].fields.length; j++)
- tf.push(this.tabs[i].fields[j]);
- }
- }
-
- var t = '';
-
- for (var i = 0; i < tf.length; i++)
- {
- if (tf[i].instance[sid] && tf[i].instance[sid].disabled)
- continue;
-
- var n = tf[i].options.caption || tf[i].name;
- var v = tf[i].textvalue(sid);
-
- if (typeof(v) == 'undefined')
- continue;
-
- t = t + '%s%s: <strong>%s</strong>'.format(t ? ' | ' : '', n, v);
- }
+ return (this.active_panel[parent_sid || '__top__'] || 0);
+ },
- return t;
+ setPanelIndex: function(parent_sid, new_index)
+ {
+ if (typeof(new_index) == 'number')
+ this.active_panel[parent_sid || '__top__'] = new_index;
},
- _render_add: function()
+ renderAdd: function()
{
if (!this.options.addremove)
return null;
- var text = _luci2.tr('Add section');
- var ttip = _luci2.tr('Create new section...');
+ 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];
.addClass('cbi-input-text')
.attr('type', 'text')
.attr('placeholder', ttip)
- .blur({ self: this }, this._ev_sid)
- .keyup({ self: this }, this._ev_sid)
+ .blur({ self: this }, this.handleSID)
+ .keyup({ self: this }, this.handleSID)
.appendTo(add);
$('<img />')
- .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._ev_add)
+ .click({ self: this }, this.handleAdd)
.appendTo(add);
$('<div />')
}
else
{
- _luci2.ui.button(text, 'success', ttip)
- .click({ self: this }, this._ev_add)
+ L.ui.button(text, 'success', ttip)
+ .click({ self: this }, this.handleAdd)
.appendTo(add);
}
return add;
},
- _render_remove: function(sid, index)
+ renderRemove: function(index)
{
if (!this.options.addremove)
return null;
- var text = _luci2.tr('Remove');
- var ttip = _luci2.tr('Remove this section');
+ 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 _luci2.ui.button(text, 'danger', ttip)
- .click({ self: this, sid: sid, index: index }, this._ev_remove);
+ return L.ui.button(text, 'danger', ttip)
+ .click({ self: this, index: index }, this.handleRemove);
},
- _render_sort: function(sid, index)
+ renderSort: function(index)
{
if (!this.options.sortable)
return null;
- var b1 = _luci2.ui.button('↑', 'info', _luci2.tr('Move up'))
- .click({ self: this, index: index, up: true }, this._ev_sort);
+ var b1 = L.ui.button('↑', 'info', L.tr('Move up'))
+ .click({ self: this, index: index, up: true }, this.handleSort);
- var b2 = _luci2.ui.button('↓', 'info', _luci2.tr('Move down'))
- .click({ self: this, index: index, up: false }, this._ev_sort);
+ var b2 = L.ui.button('↓', 'info', L.tr('Move down'))
+ .click({ self: this, index: index, up: false }, this.handleSort);
return b1.add(b2);
},
- _render_caption: function()
+ renderCaption: function()
{
return $('<h3 />')
.addClass('panel-title')
.append(this.label('caption') || this.uci_type);
},
- _render_description: function()
+ renderDescription: function()
{
var text = this.label('description');
return null;
},
- _render_teaser: function(sid, index)
+ renderTeaser: function(sid, index)
{
- if (this.options.collabsible || this.map.options.collabsible)
+ if (this.options.collabsible || this.ownerMap.options.collabsible)
{
return $('<div />')
.attr('id', this.id('teaser', sid))
return null;
},
- _render_head: function(condensed)
+ renderHead: function(condensed)
{
if (condensed)
return null;
return $('<div />')
.addClass('panel-heading')
- .append(this._render_caption())
- .append(this._render_description());
+ .append(this.renderCaption())
+ .append(this.renderDescription());
},
- _render_tab_description: function(sid, index, tab_index)
+ renderTabDescription: function(sid, index, tab_index)
{
var tab = this.tabs[tab_index];
return null;
},
- _render_tab_head: function(sid, index, tab_index)
+ renderTabHead: function(sid, index, tab_index)
{
var tab = this.tabs[tab_index];
var cur = this.active_tab[sid] || 0;
.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($('<span />')
.addClass('badge'))
- .on('shown.bs.tab', { self: this, sid: sid }, this._ev_tab));
+ .on('shown.bs.tab', { self: this, sid: sid }, this.handleTab));
if (cur == tab_index)
tabh.addClass('active');
+ if (!tab.fields.length)
+ tabh.hide();
+
return tabh;
},
- _render_tab_body: function(sid, index, tab_index)
+ renderTabBody: function(sid, index, tab_index)
{
var tab = this.tabs[tab_index];
var cur = this.active_tab[sid] || 0;
var tabb = $('<div />')
.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));
+ .append(this.renderTabDescription(sid, index, tab_index))
+ .on('validate', this.handleTabValidate);
if (cur == tab_index)
tabb.addClass('active');
return tabb;
},
- _render_section_head: function(sid, index)
+ renderPanelHead: function(sid, index, parent_sid)
{
var head = $('<div />')
.addClass('luci2-section-header')
- .append(this._render_teaser(sid, index))
+ .append(this.renderTeaser(sid, index))
.append($('<div />')
.addClass('btn-group')
- .append(this._render_sort(sid, index))
- .append(this._render_remove(sid, index)));
+ .append(this.renderSort(index))
+ .append(this.renderRemove(index)));
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);
+ .attr('data-parent', this.id('sectiongroup', parent_sid))
+ .attr('data-target', '#' + this.id('panel', sid));
}
return head;
},
- _render_section_body: function(sid, index)
+ renderPanelBody: function(sid, index, parent_sid)
{
var body = $('<div />')
.attr('id', this.id('panel', sid))
- .attr('data-luci2-panel-index', index)
- .attr('data-luci2-sid', sid);
+ .addClass('luci2-section-panel')
+ .on('validate', this.handlePanelValidate);
- if (this.options.collabsible || this.map.options.collabsible)
+ if (this.options.collabsible || this.ownerMap.options.collabsible)
{
body.addClass('panel-collapse collapse');
- if (index == this.active_panel)
+ if (index == this.getPanelIndex(parent_sid))
body.addClass('in');
}
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));
+ tab_heads.append(this.renderTabHead(sid, index, j));
+ tab_bodies.append(this.renderTabBody(sid, index, j));
}
body.append(tab_bodies);
if (this.tabs.length <= 1)
tab_heads.hide();
+ for (var i = 0; i < this.subsections.length; i++)
+ body.append(this.subsections[i].render(false, sid));
+
return body;
},
- _render_body: function(condensed)
+ renderBody: function(condensed, parent_sid)
{
- var s = this.sections();
+ var s = this.getUCISections(parent_sid);
+ var n = this.getPanelIndex(parent_sid);
- if (this.active_panel < 0)
- this.active_panel += s.length;
- else if (this.active_panel >= s.length)
- this.active_panel = s.length - 1;
+ if (n < 0)
+ this.setPanelIndex(parent_sid, n + s.length);
+ else if (n >= s.length)
+ this.setPanelIndex(parent_sid, s.length - 1);
var body = $('<ul />')
- .addClass('list-group');
+ .addClass('luci2-section-group list-group');
if (this.options.collabsible)
{
- body.attr('id', this.id('sectiongroup'))
- .on('show.bs.collapse', { self: this }, this._ev_panel_collapse);
+ body.attr('id', this.id('sectiongroup', parent_sid))
+ .on('show.bs.collapse', { self: this }, this.handlePanelCollapse);
}
if (s.length == 0)
{
body.append($('<li />')
.addClass('list-group-item text-muted')
- .text(this.label('placeholder') || _luci2.tr('There are no entries defined yet.')))
+ .text(this.label('placeholder') || L.tr('There are no entries defined yet.')))
}
for (var i = 0; i < s.length; i++)
var inst = this.instance[sid] = { tabs: [ ] };
body.append($('<li />')
- .addClass('list-group-item')
- .append(this._render_section_head(sid, i))
- .append(this._render_section_body(sid, i)));
+ .addClass('luci2-section-item list-group-item')
+ .attr('id', this.id('sectionitem', sid))
+ .attr('data-luci2-sid', sid)
+ .append(this.renderPanelHead(sid, i, parent_sid))
+ .append(this.renderPanelBody(sid, i, parent_sid)));
}
return body;
},
- render: function(condensed)
+ render: function(condensed, parent_sid)
{
this.instance = { };
var panel = $('<div />')
.addClass('panel panel-default')
- .append(this._render_head(condensed))
- .append(this._render_body(condensed));
+ .append(this.renderHead(condensed))
+ .append(this.renderBody(condensed, parent_sid));
if (this.options.addremove)
panel.append($('<div />')
.addClass('panel-footer')
- .append(this._render_add()));
+ .append(this.renderAdd()));
return panel;
},
- finish: function()
+ finish: function(parent_sid)
{
- var s = this.sections();
+ var s = this.getUCISections(parent_sid);
for (var i = 0; i < s.length; i++)
{
var sid = s[i]['.name'];
- this.validate_section(sid);
-
- if (i != this.active_panel)
+ if (i != this.getPanelIndex(parent_sid))
$('#' + this.id('teaser', sid)).children('span:last')
.append(this.teaser(sid));
else
$('#' + this.id('teaser', sid))
.hide();
+
+ for (var j = 0; j < this.subsections.length; j++)
+ this.subsections[j].finish(sid);
}
}
});
this.cbi.TableSection = this.cbi.TypedSection.extend({
- _render_table_head: function()
+ renderTableHead: function()
{
var thead = $('<thead />')
.append($('<tr />')
return thead;
},
- _render_table_row: function(sid, index)
+ renderTableRow: function(sid, index)
{
var row = $('<tr />')
+ .addClass('luci2-section-item')
+ .attr('id', this.id('sectionitem', sid))
.attr('data-luci2-sid', sid);
for (var j = 0; j < this.tabs[0].fields.length; j++)
if (this.options.addremove !== false || this.options.sortable)
{
row.append($('<td />')
+ .css('width', '1%')
.addClass('text-right')
.append($('<div />')
.addClass('btn-group')
- .append(this._render_sort(sid, index))
- .append(this._render_remove(sid, index))));
+ .append(this.renderSort(index))
+ .append(this.renderRemove(index))));
}
return row;
},
- _render_table_body: function()
+ renderTableBody: function(parent_sid)
{
- var s = this.sections();
+ var s = this.getUCISections(parent_sid);
var tbody = $('<tbody />');
.append($('<td />')
.addClass('text-muted')
.attr('colspan', cols)
- .text(this.label('placeholder') || _luci2.tr('There are no entries defined yet.'))));
+ .text(this.label('placeholder') || L.tr('There are no entries defined yet.'))));
}
for (var i = 0; i < s.length; i++)
var sid = s[i]['.name'];
var inst = this.instance[sid] = { tabs: [ ] };
- tbody.append(this._render_table_row(sid, i));
+ tbody.append(this.renderTableRow(sid, i));
}
return tbody;
},
- _render_body: function(condensed)
+ renderBody: function(condensed, parent_sid)
{
return $('<table />')
.addClass('table table-condensed table-hover')
- .append(this._render_table_head())
- .append(this._render_table_body());
+ .append(this.renderTableHead())
+ .append(this.renderTableBody(parent_sid));
}
});
this.cbi.NamedSection = this.cbi.TypedSection.extend({
- sections: function(cb)
+ getUCISections: function(cb)
{
var sa = [ ];
- var sl = _luci2.uci.sections(this.map.uci_package);
+ var sl = L.uci.sections(this.ownerMap.uci_package);
for (var i = 0; i < sl.length; i++)
if (sl[i]['.name'] == this.uci_type)
this.instance = { };
this.instance[this.uci_type] = { tabs: [ ] };
- return this._render_section_body(this.uci_type, 0);
+ return $('<div />')
+ .addClass('luci2-section-item')
+ .attr('id', this.id('sectionitem', this.uci_type))
+ .attr('data-luci2-sid', this.uci_type)
+ .append(this.renderPanelBody(this.uci_type, 0));
}
});
this.cbi.DummySection = this.cbi.TypedSection.extend({
- sections: function(cb)
+ getUCISections: function(cb)
{
if (typeof(cb) == 'function')
cb.apply(this, [ { '.name': this.uci_type } ]);
this.uci_package = uci_package;
this.sections = [ ];
- this.options = _luci2.defaults(options, {
+ this.options = L.defaults(options, {
save: function() { },
prepare: function() { }
});
},
- _load_cb: function()
+ loadCallback: function()
{
- var deferreds = [ _luci2.deferrable(this.options.prepare()) ];
+ 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 (_luci2.isDeferred(rv))
- deferreds.push(rv);
- }
- }
+ var rv = this.sections[i].load();
+ deferreds.push.apply(deferreds, rv);
}
return $.when.apply($, deferreds);
load: function()
{
var self = this;
- var packages = { };
+ var packages = [ this.uci_package ];
for (var i = 0; i < this.sections.length; i++)
- this.sections[i].ucipackages(packages);
+ packages.push.apply(packages, this.sections[i].findAdditionalUCIPackages());
- packages[this.uci_package] = true;
-
- for (var pkg in packages)
- if (!_luci2.uci.writable(pkg))
+ for (var i = 0; i < packages.length; i++)
+ if (!L.uci.writable(packages[i]))
+ {
this.options.readonly = true;
+ break;
+ }
- return _luci2.uci.load(_luci2.toArray(packages)).then(function() {
- return self._load_cb();
+ return L.uci.load(packages).then(function() {
+ return self.loadCallback();
});
},
- _ev_tab: function(ev)
+ handleTab: function(ev)
+ {
+ ev.data.self.active_tab = $(ev.target).parent().index();
+ },
+
+ handleApply: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.trigger('apply', ev);
+ },
+
+ handleSave: function(ev)
{
var self = ev.data.self;
- self.validate();
- self.active_tab = parseInt(ev.target.getAttribute('data-luci2-tab-index'));
+ self.send().then(function() {
+ self.trigger('save', ev);
+ });
},
- _render_tab_head: function(tab_index)
+ handleReset: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.trigger('reset', ev);
+ self.reset();
+ },
+
+ renderTabHead: function(tab_index)
{
var section = this.sections[tab_index];
var cur = this.active_tab || 0;
.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($('<span />')
.addClass('badge'))
- .on('shown.bs.tab', { self: this }, this._ev_tab));
+ .on('shown.bs.tab', { self: this }, this.handleTab));
if (cur == tab_index)
tabh.addClass('active');
return tabh;
},
- _render_tab_body: function(tab_index)
+ renderTabBody: function(tab_index)
{
var section = this.sections[tab_index];
var desc = section.label('description');
var tabb = $('<div />')
.addClass('tab-pane')
- .attr('id', section.id('section'))
- .attr('data-luci2-tab-index', tab_index);
+ .attr('id', section.id('section'));
if (cur == tab_index)
tabb.addClass('active');
return tabb;
},
- _render_body: function()
+ renderBody: function()
{
var tabs = $('<ul />')
.addClass('nav nav-tabs');
for (var i = 0; i < this.sections.length; i++)
{
- tabs.append(this._render_tab_head(i));
- body.append(this._render_tab_body(i));
+ tabs.append(this.renderTabHead(i));
+ body.append(this.renderTabBody(i));
}
if (this.options.tabbed)
return body;
},
- _render_footer: function()
+ renderFooter: function()
{
+ var evdata = {
+ self: this
+ };
+
return $('<div />')
.addClass('panel panel-default panel-body text-right')
.append($('<div />')
.addClass('btn-group')
- .append(_luci2.ui.button(_luci2.tr('Save & Apply'), 'primary')
- .click({ self: this }, function(ev) { }))
- .append(_luci2.ui.button(_luci2.tr('Save'), 'default')
- .click({ self: this }, function(ev) { ev.data.self.send(); }))
- .append(_luci2.ui.button(_luci2.tr('Reset'), 'default')
- .click({ self: this }, function(ev) { ev.data.self.insertInto(ev.data.self.target); })));
+ .append(L.ui.button(L.tr('Save & Apply'), 'primary')
+ .click(evdata, this.handleApply))
+ .append(L.ui.button(L.tr('Save'), 'default')
+ .click(evdata, this.handleSave))
+ .append(L.ui.button(L.tr('Reset'), 'default')
+ .click(evdata, this.handleReset)));
},
render: function()
map.append($('<p />')
.text(this.options.description));
- map.append(this._render_body());
+ map.append(this.renderBody());
if (this.options.pageaction !== false)
- map.append(this._render_footer());
+ map.append(this.renderFooter());
return map;
},
{
var w = widget ? new widget(uci_type, options) : null;
- if (!(w instanceof _luci2.cbi.AbstractSection))
+ if (!(w instanceof L.cbi.AbstractSection))
throw 'Widget must be an instance of AbstractSection';
- w.map = this;
+ w.ownerMap = this;
w.index = this.sections.length;
this.sections.push(w);
return w;
},
- formvalue: function()
- {
- var rv = { };
-
- for (var i = 0; i < this.sections.length; i++)
- {
- var sids = this.sections[i].formvalue();
- for (var sid in sids)
- {
- var s = rv[sid] || (rv[sid] = { });
- $.extend(s, sids[sid]);
- }
- }
-
- return rv;
- },
-
add: function(conf, type, name)
{
- return _luci2.uci.add(conf, type, name);
+ return L.uci.add(conf, type, name);
},
remove: function(conf, sid)
{
- return _luci2.uci.remove(conf, sid);
+ return L.uci.remove(conf, sid);
},
get: function(conf, sid, opt)
{
- return _luci2.uci.get(conf, sid, opt);
+ return L.uci.get(conf, sid, opt);
},
set: function(conf, sid, opt, val)
{
- return _luci2.uci.set(conf, sid, opt, val);
+ return L.uci.set(conf, sid, opt, val);
},
validate: function()
var self = this;
if (self.options.readonly)
- return _luci2.deferrable();
+ return L.deferrable();
var deferreds = [ ];
for (var i = 0; i < self.sections.length; i++)
{
- if (self.sections[i].options.readonly)
- continue;
-
- for (var f in self.sections[i].fields)
- {
- if (typeof(self.sections[i].fields[f].save) != 'function')
- continue;
-
- var s = self.sections[i].sections();
- for (var j = 0; j < s.length; j++)
- {
- var rv = self.sections[i].fields[f].save(s[j]['.name']);
- if (_luci2.isDeferred(rv))
- deferreds.push(rv);
- }
- }
+ var rv = self.sections[i].save();
+ deferreds.push.apply(deferreds, rv);
}
return $.when.apply($, deferreds).then(function() {
- return _luci2.deferrable(self.options.save());
+ return L.deferrable(self.options.save());
});
},
send: function()
{
if (!this.validate())
- return _luci2.deferrable();
+ return L.deferrable();
var self = this;
- _luci2.ui.saveScrollTop();
- _luci2.ui.loading(true);
+ L.ui.saveScrollTop();
+ L.ui.loading(true);
return this.save().then(function() {
- return _luci2.uci.save();
+ return L.uci.save();
}).then(function() {
- return _luci2.ui.updateChanges();
+ return L.ui.updateChanges();
}).then(function() {
return self.load();
}).then(function() {
self.redraw();
self = null;
- _luci2.ui.loading(false);
- _luci2.ui.restoreScrollTop();
+ L.ui.loading(false);
+ L.ui.restoreScrollTop();
});
},
+ revert: function()
+ {
+ var packages = [ this.uci_package ];
+
+ for (var i = 0; i < this.sections.length; i++)
+ packages.push.apply(packages, this.sections[i].findAdditionalUCIPackages());
+
+ L.uci.unload(packages);
+ },
+
+ reset: function()
+ {
+ var self = this;
+
+ self.revert();
+
+ return self.insertInto(self.target);
+ },
+
insertInto: function(id)
{
var self = this;
self.target = $(id);
- _luci2.ui.loading(true);
+ L.ui.loading(true);
self.target.hide();
return self.load().then(function() {
self.finish();
self.target.show();
self = null;
- _luci2.ui.loading(false);
+ L.ui.loading(false);
});
}
});
this.cbi.Modal = this.cbi.Map.extend({
- _render_footer: function()
+ handleApply: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.trigger('apply', ev);
+ },
+
+ handleSave: function(ev)
+ {
+ var self = ev.data.self;
+
+ self.send().then(function() {
+ self.trigger('save', ev);
+ self.close();
+ });
+ },
+
+ handleReset: function(ev)
{
+ var self = ev.data.self;
+
+ self.trigger('close', ev);
+ self.revert();
+ self.close();
+ },
+
+ renderFooter: function()
+ {
+ var evdata = {
+ self: this
+ };
+
return $('<div />')
.addClass('btn-group')
- .append(_luci2.ui.button(_luci2.tr('Save & Apply'), 'primary')
- .click({ self: this }, function(ev) { }))
- .append(_luci2.ui.button(_luci2.tr('Save'), 'default')
- .click({ self: this }, function(ev) { ev.data.self.send(); }))
- .append(_luci2.ui.button(_luci2.tr('Cancel'), 'default')
- .click({ self: this }, function(ev) { _luci2.ui.dialog(false); }));
+ .append(L.ui.button(L.tr('Save & Apply'), 'primary')
+ .click(evdata, this.handleApply))
+ .append(L.ui.button(L.tr('Save'), 'default')
+ .click(evdata, this.handleSave))
+ .append(L.ui.button(L.tr('Cancel'), 'default')
+ .click(evdata, this.handleReset));
},
render: function()
{
- var modal = _luci2.ui.dialog(this.label('caption'), null, { wide: true });
+ var modal = L.ui.dialog(this.label('caption'), null, { wide: true });
var map = $('<form />');
var desc = this.label('description');
if (desc)
map.append($('<p />').text(desc));
- map.append(this._render_body());
+ map.append(this.renderBody());
modal.find('.modal-body').append(map);
- modal.find('.modal-footer').append(this._render_footer());
+ modal.find('.modal-footer').append(this.renderFooter());
return modal;
},
{
var self = this;
- _luci2.ui.loading(true);
+ L.ui.loading(true);
return self.load().then(function() {
self.render();
self.finish();
- _luci2.ui.loading(false);
+ L.ui.loading(false);
});
+ },
+
+ close: function()
+ {
+ L.ui.dialog(false);
}
});
};
projects / project / luci2 / ui.git / blobdiff