X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fluci2.js;h=432248c3cc6e768084aa62a0f959a8bc86c6eb90;hp=fd2c67165328e8d9dde906f5aeab68eb1520cb7d;hb=863e738b445e2e53f8d84dd12535781b2d6fc081;hpb=24fda4f5c823eb097736dfef27c5f2a96041a318 diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js index fd2c671..432248c 100644 --- a/luci2/htdocs/luci2/luci2.js +++ b/luci2/htdocs/luci2/luci2.js @@ -1,7 +1,7 @@ /* LuCI2 - OpenWrt Web Interface - Copyright 2013 Jo-Philipp Wich + Copyright 2013-2014 Jo-Philipp Wich Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -173,9 +173,16 @@ String.prototype.format = function() return out + str; } +if (!window.location.origin) + window.location.origin = '%s//%s%s'.format( + window.location.protocol, + window.location.hostname, + (window.location.port ? ':' + window.location.port : '') + ); + function LuCI2() { - var _luci2 = this; + var L = this; var Class = function() { }; @@ -219,6 +226,55 @@ function LuCI2() return _class; }; + Class.require = function(name) + { + var path = '/' + name.replace(/\./g, '/') + '.js'; + + return $.ajax(path, { + method: 'GET', + async: false, + cache: true, + dataType: 'text' + }).then(function(text) { + var code = '%s\n\n//@ sourceURL=%s/%s'.format(text, window.location.origin, path); + var construct = eval(code); + + var parts = name.split(/\./); + var cparent = L.Class || (L.Class = { }); + + for (var i = 1; i < parts.length - 1; i++) + { + cparent = cparent[parts[i]]; + + if (!cparent) + throw "Missing parent class"; + } + + cparent[parts[i]] = construct; + }); + }; + + Class.instantiate = function(name) + { + Class.require(name).then(function() { + var parts = name.split(/\./); + var iparent = L; + var construct = L.Class; + + for (var i = 1; i < parts.length - 1; i++) + { + iparent = iparent[parts[i]]; + construct = construct[parts[i]]; + + if (!iparent) + throw "Missing parent class"; + } + + if (construct[parts[i]]) + iparent[parts[i]] = new construct[parts[i]](); + }); + }; + this.defaults = function(obj, def) { for (var key in def) @@ -253,42 +309,42 @@ function LuCI2() plural: function(n) { return 0 + (n != 1) }, init: function() { - if (_luci2.i18n.loaded) + if (L.i18n.loaded) return; var lang = (navigator.userLanguage || navigator.language || 'en').toLowerCase(); var langs = (lang.indexOf('-') > -1) ? [ lang, lang.split(/-/)[0] ] : [ lang ]; for (var i = 0; i < langs.length; i++) - $.ajax('%s/i18n/base.%s.json'.format(_luci2.globals.resource, langs[i]), { + $.ajax('%s/i18n/base.%s.json'.format(L.globals.resource, langs[i]), { async: false, cache: true, dataType: 'json', success: function(data) { - $.extend(_luci2.i18n.catalog, data); + $.extend(L.i18n.catalog, data); - var pe = _luci2.i18n.catalog['']; + var pe = L.i18n.catalog['']; if (pe) { - delete _luci2.i18n.catalog['']; + delete L.i18n.catalog['']; try { var pf = new Function('n', 'return 0 + (' + pe + ')'); - _luci2.i18n.plural = pf; + L.i18n.plural = pf; } catch (e) { }; } } }); - _luci2.i18n.loaded = true; + L.i18n.loaded = true; } }; this.tr = function(msgid) { - _luci2.i18n.init(); + L.i18n.init(); - var msgstr = _luci2.i18n.catalog[msgid]; + var msgstr = L.i18n.catalog[msgid]; if (typeof(msgstr) == 'undefined') return msgid; @@ -300,23 +356,23 @@ function LuCI2() this.trp = function(msgid, msgid_plural, count) { - _luci2.i18n.init(); + L.i18n.init(); - var msgstr = _luci2.i18n.catalog[msgid]; + var msgstr = L.i18n.catalog[msgid]; if (typeof(msgstr) == 'undefined') return (count == 1) ? msgid : msgid_plural; else if (typeof(msgstr) == 'string') return msgstr; else - return msgstr[_luci2.i18n.plural(count)]; + return msgstr[L.i18n.plural(count)]; }; this.trc = function(msgctx, msgid) { - _luci2.i18n.init(); + L.i18n.init(); - var msgstr = _luci2.i18n.catalog[msgid + '\u0004' + msgctx]; + var msgstr = L.i18n.catalog[msgid + '\u0004' + msgctx]; if (typeof(msgstr) == 'undefined') return msgid; @@ -328,16 +384,16 @@ function LuCI2() this.trcp = function(msgctx, msgid, msgid_plural, count) { - _luci2.i18n.init(); + L.i18n.init(); - var msgstr = _luci2.i18n.catalog[msgid + '\u0004' + msgctx]; + var msgstr = L.i18n.catalog[msgid + '\u0004' + msgctx]; if (typeof(msgstr) == 'undefined') return (count == 1) ? msgid : msgid_plural; else if (typeof(msgstr) == 'string') return msgstr; else - return msgstr[_luci2.i18n.plural(count)]; + return msgstr[L.i18n.plural(count)]; }; this.setHash = function(key, value) @@ -485,6 +541,152 @@ function LuCI2() 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', @@ -505,7 +707,7 @@ function LuCI2() data: JSON.stringify(req), dataType: 'json', type: 'POST', - timeout: _luci2.globals.timeout, + timeout: L.globals.timeout, _rpc_req: req }).then(cb, cb); }, @@ -536,7 +738,7 @@ function LuCI2() 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'; @@ -567,7 +769,7 @@ function LuCI2() { 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 */ @@ -577,7 +779,7 @@ function LuCI2() data = ret; /* delete request object */ - delete _luci2.rpc._requests[reqs[i].id]; + delete L.rpc._requests[reqs[i].id]; } return $.Deferred().resolveWith(this, [ data ]); @@ -608,7 +810,7 @@ function LuCI2() flush: function() { if (!$.isArray(this._batch)) - return _luci2.deferrable([ ]); + return L.deferrable([ ]); var req = this._batch; delete this._batch; @@ -648,7 +850,7 @@ function LuCI2() id: _rpc._id++, method: 'call', params: [ - _luci2.globals.sid, + L.globals.sid, options.object, options.method, params @@ -660,7 +862,7 @@ function LuCI2() if ($.isArray(_rpc._batch)) { req.index = _rpc._batch.push(msg) - 1; - return _luci2.deferrable(msg); + return L.deferrable(msg); } /* call rpc */ @@ -674,7 +876,7 @@ function LuCI2() init: function() { this.state = { - newid: 0, + newidx: 0, values: { }, creates: { }, changes: { }, @@ -683,38 +885,107 @@ function LuCI2() }; }, - _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; @@ -724,17 +995,17 @@ function LuCI2() 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]; @@ -758,21 +1029,21 @@ function LuCI2() 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 = name || 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) @@ -782,10 +1053,9 @@ function LuCI2() 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 { @@ -845,7 +1115,7 @@ function LuCI2() 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; @@ -890,6 +1160,7 @@ function LuCI2() 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; @@ -899,15 +1170,12 @@ function LuCI2() 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') { @@ -915,6 +1183,10 @@ function LuCI2() 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] = { }; @@ -923,12 +1195,16 @@ function LuCI2() /* 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] = { }; @@ -945,61 +1221,33 @@ function LuCI2() return this.set(conf, sid, opt, undefined); }, - _reload: function() + get_first: function(conf, type, opt) { - var pkgs = [ ]; + var sid = undefined; - for (var pkg in this.state.values) - pkgs.push(pkg); - - 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 = [ ]; + var sid = undefined; - 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 = [ ]; - - 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) @@ -1022,49 +1270,67 @@ function LuCI2() 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 @@ -1072,20 +1338,15 @@ function LuCI2() 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) { @@ -1096,7 +1357,7 @@ function LuCI2() 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 ]); @@ -1106,7 +1367,7 @@ function LuCI2() 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) @@ -1127,7 +1388,7 @@ function LuCI2() return deferred; }, - changes: _luci2.rpc.declare({ + changes: L.rpc.declare({ object: 'uci', method: 'changes', expect: { changes: { } } @@ -1135,19 +1396,19 @@ function LuCI2() 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': [ ] }, @@ -1157,7 +1418,7 @@ function LuCI2() } }), - getDeviceStatus: _luci2.rpc.declare({ + getDeviceStatus: L.rpc.declare({ object: 'iwinfo', method: 'info', params: [ 'device' ], @@ -1172,7 +1433,7 @@ function LuCI2() } }), - getAssocList: _luci2.rpc.declare({ + getAssocList: L.rpc.declare({ object: 'iwinfo', method: 'assoclist', params: [ 'device' ], @@ -1196,12 +1457,12 @@ function LuCI2() 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 = { }; @@ -1241,12 +1502,12 @@ function LuCI2() 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 = [ ]; @@ -1269,21 +1530,21 @@ function LuCI2() } if (!enc || !enc.enabled) - return _luci2.tr('None'); + return L.tr('None'); if (enc.wep) { if (enc.wep.length == 2) - return _luci2.tr('WEP Open/Shared') + ' (%s)'.format(format_list(enc.ciphers, ', ')); + return L.tr('WEP Open/Shared') + ' (%s)'.format(format_list(enc.ciphers, ', ')); else if (enc.wep[0] == 'shared') - return _luci2.tr('WEP Shared Auth') + ' (%s)'.format(format_list(enc.ciphers, ', ')); + return L.tr('WEP Shared Auth') + ' (%s)'.format(format_list(enc.ciphers, ', ')); else - return _luci2.tr('WEP Open System') + ' (%s)'.format(format_list(enc.ciphers, ', ')); + return L.tr('WEP Open System') + ' (%s)'.format(format_list(enc.ciphers, ', ')); } else if (enc.wpa) { if (enc.wpa.length == 2) - return _luci2.tr('mixed WPA/WPA2') + ' %s (%s)'.format( + return L.tr('mixed WPA/WPA2') + ' %s (%s)'.format( format_list(enc.authentication, '/'), format_list(enc.ciphers, ', ') ); @@ -1299,7 +1560,7 @@ function LuCI2() ); } - return _luci2.tr('Unknown'); + return L.tr('Unknown'); } }; @@ -1330,7 +1591,7 @@ function LuCI2() 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; @@ -1355,7 +1616,7 @@ function LuCI2() }; this.NetworkModel = { - _device_blacklist: [ + deviceBlacklist: [ /^gre[0-9]+$/, /^gretap[0-9]+$/, /^ifb[0-9]+$/, @@ -1364,48 +1625,48 @@ function LuCI2() /^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(); @@ -1418,13 +1679,13 @@ function LuCI2() 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)); @@ -1438,95 +1699,87 @@ function LuCI2() 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) - { - return _luci2.uci.set(pkg, sid, key, val); - }, - - _is_blacklisted: function(dev) + isBlacklistedDevice: 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; @@ -1541,11 +1794,11 @@ function LuCI2() 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, @@ -1555,29 +1808,29 @@ function LuCI2() ); }, - _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; @@ -1594,14 +1847,14 @@ function LuCI2() } } - 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; @@ -1627,7 +1880,7 @@ function LuCI2() } } - var net = _luci2.uci.sections('network'); + var net = L.uci.sections('network'); for (var i = 0; i < net.length; i++) { var s = net[i]; @@ -1635,7 +1888,7 @@ function LuCI2() if (s['.type'] == 'device' && s.name) { - var entry = self._get_dev(s.name); + var entry = self.getDeviceObject(s.name); switch (s.type) { @@ -1649,14 +1902,14 @@ function LuCI2() } 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'; @@ -1665,9 +1918,9 @@ function LuCI2() } 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; @@ -1694,7 +1947,7 @@ function LuCI2() if (!ifname) continue; - var entry = self._get_dev(ifname); + var entry = self.getDeviceObject(ifname); entry.kind = 'vlan'; entry.sid = sid; @@ -1703,7 +1956,7 @@ function LuCI2() } } - var wifi = _luci2.uci.sections('wireless'); + var wifi = L.uci.sections('wireless'); for (var i = 0; i < wifi.length; i++) { var s = wifi[i]; @@ -1716,12 +1969,12 @@ function LuCI2() 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; @@ -1729,7 +1982,7 @@ function LuCI2() } } - var entry = self._get_dev(ifname); + var entry = self.getDeviceObject(ifname); entry.kind = 'wifi'; entry.sid = sid; @@ -1748,21 +2001,21 @@ function LuCI2() 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; @@ -1771,10 +2024,10 @@ function LuCI2() } }, - _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++) { @@ -1783,22 +2036,22 @@ function LuCI2() 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); } @@ -1822,11 +2075,11 @@ function LuCI2() } } - 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) */ @@ -1843,85 +2096,85 @@ function LuCI2() { 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)); @@ -1941,12 +2194,12 @@ function LuCI2() { 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)); } @@ -1965,8 +2218,8 @@ function LuCI2() 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; }, @@ -1975,9 +2228,9 @@ function LuCI2() { 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, @@ -1997,11 +2250,11 @@ function LuCI2() }); }, - _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; @@ -2020,20 +2273,20 @@ function LuCI2() 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') @@ -2042,10 +2295,10 @@ function LuCI2() 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; @@ -2053,17 +2306,17 @@ function LuCI2() }; 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; @@ -2075,14 +2328,14 @@ function LuCI2() { 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() @@ -2107,52 +2360,52 @@ function LuCI2() 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) @@ -2165,12 +2418,12 @@ function LuCI2() 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) @@ -2201,8 +2454,8 @@ function LuCI2() 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) { @@ -2210,7 +2463,7 @@ function LuCI2() 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); } @@ -2220,7 +2473,7 @@ function LuCI2() 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; @@ -2232,7 +2485,7 @@ function LuCI2() 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(); @@ -2241,12 +2494,12 @@ function LuCI2() 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), @@ -2262,7 +2515,7 @@ function LuCI2() 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), @@ -2273,35 +2526,35 @@ function LuCI2() 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); @@ -2310,7 +2563,7 @@ function LuCI2() } 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()); @@ -2321,9 +2574,9 @@ function LuCI2() }); 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) @@ -2334,12 +2587,12 @@ function LuCI2() 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() @@ -2354,7 +2607,7 @@ function LuCI2() isUp: function() { - return (this._status('up') === true); + return (this.getStatus('up') === true); }, isVirtual: function() @@ -2365,19 +2618,19 @@ function LuCI2() 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; }, @@ -2385,7 +2638,7 @@ function LuCI2() getPhysdev: function() { if (this.options.l2dev) - return _luci2.NetworkModel.getDevice(this.options.l2dev); + return L.NetworkModel.getDevice(this.options.l2dev); return undefined; }, @@ -2394,11 +2647,11 @@ function LuCI2() { 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; }, @@ -2406,7 +2659,7 @@ function LuCI2() 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++) @@ -2423,7 +2676,7 @@ function LuCI2() var rv = [ ]; var addrs; - addrs = this._status('ipv6-address'); + addrs = this.getStatus('ipv6-address'); if (addrs) for (var i = 0; i < addrs.length; i++) @@ -2432,7 +2685,7 @@ function LuCI2() 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++) @@ -2447,7 +2700,7 @@ function LuCI2() 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++) @@ -2459,7 +2712,7 @@ function LuCI2() 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++) @@ -2472,7 +2725,7 @@ function LuCI2() 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++) @@ -2484,7 +2737,7 @@ function LuCI2() getIPv4Gateway: function() { - var rt = this._status('route'); + var rt = this.getStatus('route'); if (rt) for (var i = 0; i < rt.length; i++) @@ -2496,7 +2749,7 @@ function LuCI2() getIPv6Gateway: function() { - var rt = this._status('route'); + var rt = this.getStatus('route'); if (rt) for (var i = 0; i < rt.length; i++) @@ -2508,16 +2761,40 @@ function LuCI2() 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 = $('') + .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($('') + .attr('src', subdevs[j].icon()) + .attr('title', '%s (%s)'.format(subdevs[j].description(), subdevs[j].name() || '?'))); + else if (dev) + badge.append($('') + .attr('src', dev.icon()) + .attr('title', '%s (%s)'.format(dev.description(), dev.name() || '?'))); + else + badge.append($('').text(L.tr('(No devices attached)'))); + + return badge; + }, + setDevices: function(devs) { var dev = this.getPhysdev(); @@ -2536,7 +2813,7 @@ function LuCI2() { 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) @@ -2555,8 +2832,8 @@ function LuCI2() { 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); @@ -2566,7 +2843,7 @@ function LuCI2() changeProtocol: function(proto) { - var pr = _luci2.NetworkModel._protos[proto]; + var pr = L.NetworkModel.protocolHandlers[proto]; if (!pr) return; @@ -2604,55 +2881,55 @@ function LuCI2() 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) { @@ -2660,7 +2937,7 @@ function LuCI2() 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); @@ -2669,29 +2946,29 @@ function LuCI2() 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' @@ -2719,15 +2996,15 @@ function LuCI2() }; } - 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' @@ -2768,19 +3045,19 @@ function LuCI2() }); 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: { '': { } } @@ -2788,13 +3065,13 @@ function LuCI2() 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]); @@ -2805,64 +3082,29 @@ function LuCI2() }); }, - getProcessList: _luci2.rpc.declare({ + + initList: L.rpc.declare({ object: 'luci2.system', - method: 'process_list', - expect: { processes: [ ] }, + method: 'init_list', + expect: { initscripts: [ ] }, filter: function(data) { - data.sort(function(a, b) { return a.pid - b.pid }); + data.sort(function(a, b) { return (a.start || 0) - (b.start || 0) }); 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) + initEnabled: function(init, 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({ - object: 'luci2.system', - method: 'init_list', - expect: { initscripts: [ ] }, - filter: function(data) { - data.sort(function(a, b) { return (a.start || 0) - (b.start || 0) }); - return data; - } - }), - - initEnabled: function(init, cb) - { - return this.initList().then(function(list) { - for (var i = 0; i < list.length; i++) - if (list[i].name == init) - return !!list[i].enabled; + return this.initList().then(function(list) { + for (var i = 0; i < list.length; i++) + if (list[i].name == init) + return !!list[i].enabled; return false; }); }, - initRun: _luci2.rpc.declare({ + initRun: L.rpc.declare({ object: 'luci2.system', method: 'init_action', params: [ 'name', 'action' ], @@ -2871,257 +3113,30 @@ function LuCI2() } }), - initStart: function(init, cb) { return _luci2.system.initRun(init, 'start', cb) }, - initStop: function(init, cb) { return _luci2.system.initRun(init, 'stop', cb) }, - initRestart: function(init, cb) { return _luci2.system.initRun(init, 'restart', cb) }, - initReload: function(init, cb) { return _luci2.system.initRun(init, 'reload', cb) }, - initEnable: function(init, cb) { return _luci2.system.initRun(init, 'enable', cb) }, - initDisable: function(init, cb) { return _luci2.system.initRun(init, 'disable', cb) }, - - - getRcLocal: _luci2.rpc.declare({ - object: 'luci2.system', - method: 'rclocal_get', - expect: { data: '' } - }), - - setRcLocal: _luci2.rpc.declare({ - object: 'luci2.system', - method: 'rclocal_set', - params: [ 'data' ] - }), - - - 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' - }), + initStart: function(init, cb) { return L.system.initRun(init, 'start', cb) }, + initStop: function(init, cb) { return L.system.initRun(init, 'stop', cb) }, + initRestart: function(init, cb) { return L.system.initRun(init, 'restart', cb) }, + initReload: function(init, cb) { return L.system.initRun(init, 'reload', cb) }, + initEnable: function(init, cb) { return L.system.initRun(init, 'enable', cb) }, + initDisable: function(init, cb) { return L.system.initRun(init, 'disable', cb) }, - performReboot: _luci2.rpc.declare({ + performReboot: L.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({ + login: L.rpc.declare({ object: 'session', method: 'login', params: [ 'username', 'password' ], expect: { '': { } } }), - access: _luci2.rpc.declare({ + access: L.rpc.declare({ object: 'session', method: 'access', params: [ 'scope', 'object', 'function' ], @@ -3130,21 +3145,21 @@ function LuCI2() 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() @@ -3157,28 +3172,28 @@ function LuCI2() }, - _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]); @@ -3214,7 +3229,7 @@ function LuCI2() var win = $(window); var body = $('body'); - var state = _luci2.ui._loading || (_luci2.ui._loading = { + var state = L.ui._loading || (L.ui._loading = { modal: $('
') .css('z-index', 2000) .addClass('modal fade') @@ -3224,7 +3239,7 @@ function LuCI2() .addClass('modal-content luci2-modal-loader') .append($('
') .addClass('modal-body') - .text(_luci2.tr('Loading data…'))))) + .text(L.tr('Loading data…'))))) .appendTo(body) .modal({ backdrop: 'static', @@ -3240,7 +3255,7 @@ function LuCI2() var win = $(window); var body = $('body'); - var state = _luci2.ui._dialog || (_luci2.ui._dialog = { + var state = L.ui._dialog || (L.ui._dialog = { dialog: $('
') .addClass('modal fade') .append($('
') @@ -3255,7 +3270,7 @@ function LuCI2() .addClass('modal-body')) .append($('
') .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'); }))))) @@ -3279,20 +3294,20 @@ function LuCI2() 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)); } @@ -3315,7 +3330,7 @@ function LuCI2() upload: function(title, content, options) { - var state = _luci2.ui._upload || (_luci2.ui._upload = { + var state = L.ui._upload || (L.ui._upload = { form: $('
') .attr('method', 'post') .attr('action', '/cgi-bin/luci-upload') @@ -3357,17 +3372,17 @@ function LuCI2() json = $.parseJSON(body.innerHTML); } catch(e) { json = { - message: _luci2.tr('Invalid server response received'), - error: [ -1, _luci2.tr('Invalid data') ] + message: L.tr('Invalid server response received'), + error: [ -1, L.tr('Invalid data') ] }; }; if (json.error) { L.ui.dialog(L.tr('File upload'), [ - $('

').text(_luci2.tr('The file upload failed with the server response below:')), + $('

').text(L.tr('The file upload failed with the server response below:')), $('

').addClass('alert-message').text(json.message || json.error[1]),
-							$('
').text(_luci2.tr('In case of network problems try uploading the file again.'))
+							$('
').text(L.tr('In case of network problems try uploading the file again.'))
 						], { style: 'close' });
 					}
 					else if (typeof(state.success_cb) == 'function')
@@ -3389,7 +3404,7 @@ function LuCI2()
 
 					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);
 				}
@@ -3397,14 +3412,14 @@ function LuCI2()
 
 			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
 			});
@@ -3418,9 +3433,9 @@ function LuCI2()
 			var images    = $();
 			var interval, timeout;
 
-			_luci2.ui.dialog(
-				_luci2.tr('Waiting for device'), [
-					$('
').text(_luci2.tr('Please stand by while the device is reconfiguring …')),
+			L.ui.dialog(
+				L.tr('Waiting for device'), [
+					$('
').text(L.tr('Please stand by while the device is reconfiguring …')),
 					$('
')
 						.css('width', '100%')
 						.addClass('progressbar')
@@ -3433,7 +3448,7 @@ function LuCI2()
 			for (var i = 0; i < protocols.length; i++)
 				images = images.add($('').attr('url', protocols[i] + '://' + address + ':' + ports[i]));
 
-			//_luci2.network.getNetworkStatus(function(s) {
+			//L.network.getNetworkStatus(function(s) {
 			//	for (var i = 0; i < protocols.length; i++)
 			//	{
 			//		for (var j = 0; j < s.length; j++)
@@ -3448,12 +3463,12 @@ function LuCI2()
 			//}).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
@@ -3465,7 +3480,7 @@ function LuCI2()
 
 				interval = window.setInterval(function() {
 					images.each(function() {
-						this.setAttribute('src', this.getAttribute('url') + _luci2.globals.resource + '/icons/loading.gif?r=' + Math.random());
+						this.setAttribute('src', this.getAttribute('url') + L.globals.resource + '/icons/loading.gif?r=' + Math.random());
 					});
 				}, 5000);
 
@@ -3473,9 +3488,9 @@ function LuCI2()
 					window.clearInterval(interval);
 					images.off('load');
 
-					_luci2.ui.dialog(
-						_luci2.tr('Device not responding'),
-						_luci2.tr('The device was not responding within 180 seconds, you might need to manually reconnect your computer or use SSH to regain access.'),
+					L.ui.dialog(
+						L.tr('Device not responding'),
+						L.tr('The device was not responding within 180 seconds, you might need to manually reconnect your computer or use SSH to regain access.'),
 						{ style: 'close' }
 					);
 				}, 180000);
@@ -3484,16 +3499,16 @@ function LuCI2()
 
 		login: function(invalid)
 		{
-			var state = _luci2.ui._login || (_luci2.ui._login = {
+			var state = L.ui._login || (L.ui._login = {
 				form: $('')
 					.attr('target', '')
 					.attr('method', 'post')
 					.append($('
')
 						.addClass('alert-message')
-						.text(_luci2.tr('Wrong username or password given!')))
+						.text(L.tr('Wrong username or password given!')))
 					.append($('
')
 						.append($('
')
 						.append($('
')
-						.text(_luci2.tr('Enter your username and password above, then click "%s" to proceed.').format(_luci2.tr('Ok')))),
+						.text(L.tr('Enter your username and password above, then click "%s" to proceed.').format(L.tr('Ok')))),
 
 				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();
 					}
 				},
@@ -3541,9 +3556,9 @@ function LuCI2()
 					if (!u)
 						return;
 
-					_luci2.ui.dialog(
-						_luci2.tr('Logging in'), [
-							$('
').text(_luci2.tr('Log in in progress …')),
+					L.ui.dialog(
+						L.tr('Logging in'), [
+							$('
').text(L.tr('Log in in progress …')),
 							$('
')
 								.css('width', '100%')
 								.addClass('progressbar')
@@ -3553,8 +3568,8 @@ function LuCI2()
 						], { 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);
 				}
 			});
 
@@ -3562,20 +3577,20 @@ function LuCI2()
 				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();
 					}
 				});
 
@@ -3587,7 +3602,7 @@ function LuCI2()
 			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
 			});
@@ -3597,7 +3612,7 @@ function LuCI2()
 			return state.deferred;
 		},
 
-		cryptPassword: _luci2.rpc.declare({
+		cryptPassword: L.rpc.declare({
 			object: 'luci2.ui',
 			method: 'crypt',
 			params: [ 'data' ],
@@ -3605,7 +3620,7 @@ function LuCI2()
 		}),
 
 
-		_acl_merge_scope: function(acl_scope, scope)
+		mergeACLScope: function(acl_scope, scope)
 		{
 			if ($.isArray(scope))
 			{
@@ -3627,19 +3642,19 @@ function LuCI2()
 			}
 		},
 
-		_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))
 			{
@@ -3649,86 +3664,112 @@ function LuCI2()
 				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: [ ] }
 		}),
 
-		renderMainMenu: _luci2.rpc.declare({
+		getAvailableACLs: function()
+		{
+			return this.callACLs().then(this.callACLsCallback);
+		},
+
+		renderChangeIndicator: function()
+		{
+			return $('