luci-base: luci.js: get rid of global `L` references in internal classes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 616d2a61e40ff2c19f38804f08c5b9ccf156639f)

diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 2245e0fca998845663c9fc9cdbd4ac1004f355d5..6adbf2a50660ee8031e19dd270d9c822082f0fd3 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -1718,7 +1718,7 @@
                 */
                bindClassInstance: function(node, inst) {
                        if (!(inst instanceof Class))
-                               L.error('TypeError', 'Argument must be a class instance');
+                               LuCI.prototype.error('TypeError', 'Argument must be a class instance');
 
                        return this.data(node, '_class', inst);
                },
@@ -1948,13 +1948,13 @@
                        DOM.content(vp, E('div', { 'class': 'spinning' }, _('Loading view…')));
 
                        return Promise.resolve(this.load())
-                               .then(L.bind(this.render, this))
-                               .then(L.bind(function(nodes) {
+                               .then(LuCI.prototype.bind(this.render, this))
+                               .then(LuCI.prototype.bind(function(nodes) {
                                        var vp = document.getElementById('view');
 
                                        DOM.content(vp, nodes);
                                        DOM.append(vp, this.addFooter());
-                               }, this)).catch(L.error);
+                               }, this)).catch(LuCI.prototype.error);
                },
 
                /**
@@ -2088,7 +2088,7 @@
                 */
                handleSaveApply: function(ev, mode) {
                        return this.handleSave(ev).then(function() {
-                               L.ui.changes.apply(mode == '0');
+                               classes.ui.changes.apply(mode == '0');
                        });
                },
 
@@ -2160,7 +2160,7 @@
                addFooter: function() {
                        var footer = E([]);
 
-                       var saveApplyBtn = this.handleSaveApply ? new L.ui.ComboButton('0', {
+                       var saveApplyBtn = this.handleSaveApply ? new classes.ui.ComboButton('0', {
                                0: [ _('Save & Apply') ],
                                1: [ _('Apply unchecked') ]
                        }, {
@@ -2168,7 +2168,7 @@
                                        0: 'btn cbi-button cbi-button-apply important',
                                        1: 'btn cbi-button cbi-button-negative important'
                                },
-                               click: L.ui.createHandlerFn(this, 'handleSaveApply')
+                               click: classes.ui.createHandlerFn(this, 'handleSaveApply')
                        }).render() : E([]);
 
                        if (this.handleSaveApply || this.handleSave || this.handleReset) {
@@ -2176,11 +2176,11 @@
                                        saveApplyBtn, ' ',
                                        this.handleSave ? E('button', {
                                                'class': 'cbi-button cbi-button-save',
-                                               'click': L.ui.createHandlerFn(this, 'handleSave')
+                                               'click': classes.ui.createHandlerFn(this, 'handleSave')
                                        }, [ _('Save') ]) : '', ' ',
                                        this.handleReset ? E('button', {
                                                'class': 'cbi-button cbi-button-reset',
-                                               'click': L.ui.createHandlerFn(this, 'handleReset')
+                                               'click': classes.ui.createHandlerFn(this, 'handleReset')
                                        }, [ _('Reset') ]) : ''
                                ]));
                        }
@@ -2348,12 +2348,13 @@
                 */
                error: function(type, fmt /*, ...*/) {
                        try {
-                               L.raise.apply(L, Array.prototype.slice.call(arguments));
+                               LuCI.prototype.raise.apply(LuCI.prototype,
+                                       Array.prototype.slice.call(arguments));
                        }
                        catch (e) {
                                if (!e.reported) {
-                                       if (L.ui)
-                                               L.ui.addNotification(e.name || _('Runtime error'),
+                                       if (classes.ui)
+                                               classes.ui.addNotification(e.name || _('Runtime error'),
                                                        E('pre', {}, e.message), 'danger');
                                        else
                                                DOM.content(document.querySelector('#maincontent'),
@@ -2432,7 +2433,7 @@
                        if (classes[name] != null) {
                                /* Circular dependency */
                                if (from.indexOf(name) != -1)
-                                       L.raise('DependencyError',
+                                       LuCI.prototype.raise('DependencyError',
                                                'Circular dependency: class "%s" depends on "%s"',
                                                name, from.join('" which depends on "'));
 
@@ -2444,7 +2445,7 @@
 
                        var compileClass = function(res) {
                                if (!res.ok)
-                                       L.raise('NetworkError',
+                                       LuCI.prototype.raise('NetworkError',
                                                'HTTP error %d while loading class file "%s"', res.status, url);
 
                                var source = res.text(),
@@ -2469,7 +2470,7 @@
 
                                                if (m) {
                                                        var dep = m[1], as = m[2] || dep.replace(/[^a-zA-Z0-9_]/g, '_');
-                                                       depends.push(L.require(dep, from));
+                                                       depends.push(LuCI.prototype.require(dep, from));
                                                        args += ', ' + as;
                                                }
                                                else if (!strictmatch.exec(s)) {
@@ -2495,7 +2496,7 @@
                                                                .format(args, source, res.url));
                                        }
                                        catch (error) {
-                                               L.raise('SyntaxError', '%s\n  in %s:%s',
+                                               LuCI.prototype.raise('SyntaxError', '%s\n  in %s:%s',
                                                        error.message, res.url, error.lineNumber || '?');
                                        }
 
@@ -2503,7 +2504,7 @@
                                        _class = _factory.apply(_factory, [window, document, L].concat(instances));
 
                                        if (!Class.isSubclass(_class))
-                                           L.error('TypeError', '"%s" factory yields invalid constructor', name);
+                                           LuCI.prototype.error('TypeError', '"%s" factory yields invalid constructor', name);
 
                                        if (_class.displayName == 'AnonymousClass')
                                                _class.displayName = toCamelCase(name + 'Class');
@@ -2642,7 +2643,7 @@
                notifySessionExpiry: function() {
                        Poll.stop();
 
-                       L.ui.showModal(_('Session expired'), [
+                       classes.ui.showModal(_('Session expired'), [
                                E('div', { class: 'alert-message warning' },
                                        _('A new login is required since the authentication session expired.')),
                                E('div', { class: 'right' },
@@ -2655,7 +2656,7 @@
                                        }, _('To login…')))
                        ]);
 
-                       L.raise('SessionError', 'Login session is expired');
+                       LuCI.prototype.raise('SessionError', 'Login session is expired');
                },
 
                /* private */
@@ -2669,10 +2670,13 @@
                        rpcClass.setBaseURL(rpcBaseURL);
 
                        rpcClass.addInterceptor(function(msg, req) {
-                               if (!L.isObject(msg) || !L.isObject(msg.error) || msg.error.code != -32002)
+                               if (!LuCI.prototype.isObject(msg) ||
+                                   !LuCI.prototype.isObject(msg.error) ||
+                                   msg.error.code != -32002)
                                        return;
 
-                               if (!L.isObject(req) || (req.object == 'session' && req.method == 'access'))
+                               if (!LuCI.prototype.isObject(req) ||
+                                   (req.object == 'session' && req.method == 'access'))
                                        return;
 
                                return rpcClass.declare({
@@ -2680,7 +2684,7 @@
                                        'method': 'access',
                                        'params': [ 'scope', 'object', 'function' ],
                                        'expect': { access: true }
-                               })('uci', 'luci', 'read').catch(L.notifySessionExpiry);
+                               })('uci', 'luci', 'read').catch(LuCI.prototype.notifySessionExpiry);
                        });
 
                        Request.addInterceptor(function(res) {
@@ -2692,13 +2696,13 @@
                                if (!isDenied)
                                        return;
 
-                               L.notifySessionExpiry();
+                               LuCI.prototype.notifySessionExpiry();
                        });
 
                        return Promise.all([
                                this.probeSystemFeatures(),
                                this.probePreloadClasses()
-                       ]).finally(L.bind(function() {
+                       ]).finally(LuCI.prototype.bind(function() {
                                var tasks = [];
 
                                if (Array.isArray(preloadClasses))
@@ -3291,7 +3295,7 @@
                 */
                get: function(url, data, callback, timeout) {
                        this.active = true;
-                       L.get(url, data, this._response.bind(this, callback), timeout);
+                       LuCI.prototype.get(url, data, this._response.bind(this, callback), timeout);
                },
 
                /**
@@ -3318,7 +3322,7 @@
                 */
                post: function(url, data, callback, timeout) {
                        this.active = true;
-                       L.post(url, data, this._response.bind(this, callback), timeout);
+                       LuCI.prototype.post(url, data, this._response.bind(this, callback), timeout);
                },
 
                /**
@@ -3372,12 +3376,12 @@
                 * Throws an `InternalError` with the message `Not implemented`
                 * when invoked.
                 */
-               send_form: function() { L.error('InternalError', 'Not implemented') },
+               send_form: function() { LuCI.prototype.error('InternalError', 'Not implemented') },
        });
 
-       XHR.get = function() { return window.L.get.apply(window.L, arguments) };
-       XHR.post = function() { return window.L.post.apply(window.L, arguments) };
-       XHR.poll = function() { return window.L.poll.apply(window.L, arguments) };
+       XHR.get = function() { return LuCI.prototype.get.apply(LuCI.prototype, arguments) };
+       XHR.post = function() { return LuCI.prototype.post.apply(LuCI.prototype, arguments) };
+       XHR.poll = function() { return LuCI.prototype.poll.apply(LuCI.prototype, arguments) };
        XHR.stop = Request.poll.remove.bind(Request.poll);
        XHR.halt = Request.poll.stop.bind(Request.poll);
        XHR.run = Request.poll.start.bind(Request.poll);