treewide: import utility classes explicitly

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

114 files changed, 266 insertions, 139 deletions

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
index 7e053c6192..b0c8b5aafc 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js
@@ -1,8 +1,9 @@
 'use strict';
+'require view';
 'require fs';
 'require ui';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return L.resolveDefault(fs.read_direct('/etc/adblock/adblock.blacklist'), '');
 	},
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
index 58a6dbe1a9..a042c35169 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require fs';
 'require ui';
 
@@ -186,7 +187,7 @@ function handleAction(ev) {
 	}
 }
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['report', '+', '50', 'false', 'json']),'');
 	},
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js
index 64f23b14c8..4dc2a2e533 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js
@@ -1,7 +1,9 @@
 'use strict';
+'require view';
+'require poll';
 'require fs';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(fs.stat('/sbin/logread'), null),
@@ -10,7 +12,7 @@ return L.view.extend({
 	},
 	render: function(stat) {
 		var logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null;
-		L.Poll.add(function() {
+		poll.add(function() {
 			return L.resolveDefault(fs.exec_direct(logger, ['-e', 'adblock-'])).then(function(res) {
 				var log = document.getElementById("logfile");
 				if (res) {
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index bd997a49cf..2ebab91dd5 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -1,4 +1,6 @@
 'use strict';
+'require view';
+'require poll';
 'require fs';
 'require ui';
 'require uci';
@@ -98,7 +100,7 @@ async function handleAction(ev) {
 		}
 	}
 
-	L.Poll.start();
+	poll.start();
 	fs.exec_direct('/etc/init.d/adblock', [ev])
 	var running = 1;
 	while (running === 1) {
@@ -109,10 +111,10 @@ async function handleAction(ev) {
 			}
 		})
 	}
-	L.Poll.stop();
+	poll.stop();
 }
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['list']), {}),
@@ -129,7 +131,7 @@ return L.view.extend({
 		/*
 			poll runtime information
 		*/
-		pollData: L.Poll.add(function() {
+		pollData: poll.add(function() {
 			return L.resolveDefault(fs.read_direct('/tmp/adb_runtime.json'), 'null').then(function(res) {
 				var info = JSON.parse(res);
 				var status = document.getElementById('status');
@@ -142,7 +144,7 @@ return L.view.extend({
 					} else {
 						if (status.classList.contains("spinning")) {
 							status.classList.remove("spinning");
-							L.Poll.stop();
+							poll.stop();
 						}
 					}
 					if (status.textContent.substr(0,6) === 'paused' && document.getElementById('btn_suspend')) {
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
index 26ca7bfd2a..5d310f1dbe 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js
@@ -1,8 +1,9 @@
 'use strict';
+'require view';
 'require fs';
 'require ui';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return L.resolveDefault(fs.read_direct('/etc/adblock/adblock.whitelist'), '');
 	},
diff --git a/applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js b/applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js
index 392cf239b7..a15563e5b8 100644
--- a/applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js
+++ b/applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js
@@ -1,4 +1,7 @@
 'use strict';
+'require view';
+'require dom';
+'require poll';
 'require uci';
 'require rpc';
 'require fs';
@@ -41,7 +44,7 @@ callDDnsGetStatus = rpc.declare({
 	expect: {  }
 });
 
-return L.view.extend({
+return view.extend({
 
 	callDDnsGetEnv: rpc.declare({
 		object: 'luci.ddns',
@@ -64,7 +67,7 @@ return L.view.extend({
 
 		ddns_toggle.innerHTML = status['_enabled'] ? _('Stop DDNS') : _('Start DDNS')
 
-		L.dom.content(ddns_enabled, function() {
+		dom.content(ddns_enabled, function() {
 			return E([], [
 				E('div', {}, status['_enabled'] ? _('DDNS Autostart enabled') : [
 					_('DDNS Autostart disabled'),
@@ -374,7 +377,7 @@ return L.view.extend({
 					(resolved[section_id].pid && cfg_enabled == '1'))
 				stop_opt['disabled'] = 'disabled';
 
-			L.dom.content(tdEl.lastChild, [
+			dom.content(tdEl.lastChild, [
 				E('button', stop_opt, _('Stop')),
 				E('button', reload_opt, _('Reload')),
 				tdEl.lastChild.childNodes[0],
@@ -982,7 +985,7 @@ return L.view.extend({
 		}
 
 		return m.render().then(L.bind(function(m, nodes) {
-			L.Poll.add(L.bind(function() {
+			poll.add(L.bind(function() {
 				return Promise.all([
 					this.callDDnsGetServicesStatus(),
 					callDDnsGetStatus()
diff --git a/applications/luci-app-ddns/htdocs/luci-static/resources/view/status/include/70_ddns.js b/applications/luci-app-ddns/htdocs/luci-static/resources/view/status/include/70_ddns.js
index 698cf8d254..13e8fba217 100644
--- a/applications/luci-app-ddns/htdocs/luci-static/resources/view/status/include/70_ddns.js
+++ b/applications/luci-app-ddns/htdocs/luci-static/resources/view/status/include/70_ddns.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require rpc';
 'require uci';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Dynamic DNS'),
 
 	callDDnsGetServicesStatus: rpc.declare({
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
index 640b28cf74..e85b6bc6ea 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
@@ -1,4 +1,6 @@
 'use strict';
+'require baseclass';
+'require dom';
 'require ui';
 'require uci';
 'require form';
@@ -81,7 +83,7 @@ function lookupProto(x) {
 	return [ -1, x, x ];
 }
 
-return L.Class.extend({
+return baseclass.extend({
 	fmt: function(fmtstr, args, values) {
 		var repl = [],
 		    wrap = false,
@@ -112,7 +114,7 @@ return L.Class.extend({
 		};
 
 		var isset = function(val) {
-			if (L.isObject(val) && !L.dom.elem(val)) {
+			if (L.isObject(val) && !dom.elem(val)) {
 				for (var k in val)
 					if (val.hasOwnProperty(k))
 						return true;
@@ -128,7 +130,7 @@ return L.Class.extend({
 		};
 
 		var parse = function(tokens, text) {
-			if (L.dom.elem(text)) {
+			if (dom.elem(text)) {
 				tokens.push('<span data-fmt-placeholder="%d"></span>'.format(values.length));
 				values.push(text);
 			}
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
index 9feafd824e..ca870552a6 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js
@@ -1,8 +1,9 @@
 'use strict';
+'require view';
 'require fs';
 'require ui';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return L.resolveDefault(fs.read('/etc/firewall.user'), '');
 	},
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
index 916a32fcaf..82703c320e 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require ui';
 'require rpc';
 'require uci';
@@ -84,7 +85,7 @@ function rule_target_txt(s) {
 	});
 }
 
-return L.view.extend({
+return view.extend({
 	callHostHints: rpc.declare({
 		object: 'luci-rpc',
 		method: 'getHostHints',
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
index ada05f24ca..8cb1a1242b 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require ui';
 'require rpc';
 'require uci';
@@ -136,7 +137,7 @@ function rule_target_txt(s, ctHelpers) {
 	}
 }
 
-return L.view.extend({
+return view.extend({
 	callHostHints: rpc.declare({
 		object: 'luci-rpc',
 		method: 'getHostHints',
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
index 8a1d41e719..859dba3e88 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require ui';
 'require rpc';
 'require uci';
@@ -90,7 +91,7 @@ function rule_target_txt(s) {
 	}
 }
 
-return L.view.extend({
+return view.extend({
 	callHostHints: rpc.declare({
 		object: 'luci-rpc',
 		method: 'getHostHints',
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 85c126d7ae..85e20a23c7 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require rpc';
 'require uci';
 'require form';
@@ -7,7 +8,7 @@
 'require tools.firewall as fwtool';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	callConntrackHelpers: rpc.declare({
 		object: 'luci',
 		method: 'getConntrackHelpers',
diff --git a/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js b/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
index da86569f18..d93655188b 100644
--- a/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
+++ b/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require ui';
 'require form';
 'require tools.widgets as widgets';
@@ -113,7 +114,7 @@ function defOpts(s, opts, params) {
 	}
 }
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js b/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
index d941a99379..5c2162f94a 100644
--- a/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
+++ b/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require form';
 'require tools.widgets as widgets';
 
@@ -88,7 +89,7 @@ function defOpts(s, opts, params) {
 	}
 }
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js b/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js
index 6cf9f3edae..4a9de896f9 100644
--- a/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js
+++ b/applications/luci-app-ksmbd/htdocs/luci-static/resources/view/ksmbd.js
@@ -1,9 +1,10 @@
 'use strict';
+'require view';
 'require fs';
 'require form';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(fs.stat('/sbin/block'), null),
diff --git a/applications/luci-app-ledtrig-rssi/htdocs/luci-static/resources/view/system/led-trigger/rssi.js b/applications/luci-app-ledtrig-rssi/htdocs/luci-static/resources/view/system/led-trigger/rssi.js
index 611adc8b1b..8f8b8ad781 100644
--- a/applications/luci-app-ledtrig-rssi/htdocs/luci-static/resources/view/system/led-trigger/rssi.js
+++ b/applications/luci-app-ledtrig-rssi/htdocs/luci-static/resources/view/system/led-trigger/rssi.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	trigger: _('rssi (service)'),
 	kernel: false,
 	addFormOptions(s){
diff --git a/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch0.js b/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch0.js
index 2f59866a6c..dd68c93cf8 100644
--- a/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch0.js
+++ b/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch0.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	trigger: _('switch0 (kernel)'),
 	kernel: true,
 	addFormOptions(s){
diff --git a/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch1.js b/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch1.js
index 7800cba227..42cac4edbe 100644
--- a/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch1.js
+++ b/applications/luci-app-ledtrig-switch/htdocs/luci-static/resources/view/system/led-trigger/switch1.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	trigger: _('switch1 (kernel)'),
 	kernel: true,
 	addFormOptions(s){
diff --git a/applications/luci-app-ledtrig-usbport/htdocs/luci-static/resources/view/system/led-trigger/usbport.js b/applications/luci-app-ledtrig-usbport/htdocs/luci-static/resources/view/system/led-trigger/usbport.js
index 970016c42b..71ed7bf8ae 100644
--- a/applications/luci-app-ledtrig-usbport/htdocs/luci-static/resources/view/system/led-trigger/usbport.js
+++ b/applications/luci-app-ledtrig-usbport/htdocs/luci-static/resources/view/system/led-trigger/usbport.js
@@ -1,4 +1,5 @@
 'use strict';
+'require baseclass';
 'require rpc';
 'require uci';
 'require form';
@@ -9,7 +10,7 @@ var callUSB = rpc.declare({
 	expect: { 'ports': [] }
 });
 
-return L.Class.extend({
+return baseclass.extend({
 	trigger: _('usbport (kernel)'),
 	kernel: true,
 	addFormOptions(s){
diff --git a/applications/luci-app-minidlna/htdocs/luci-static/resources/view/minidlna.js b/applications/luci-app-minidlna/htdocs/luci-static/resources/view/minidlna.js
index ff3cae13ee..083f2bafa2 100644
--- a/applications/luci-app-minidlna/htdocs/luci-static/resources/view/minidlna.js
+++ b/applications/luci-app-minidlna/htdocs/luci-static/resources/view/minidlna.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require fs';
 'require uci';
 'require form';
@@ -28,7 +29,7 @@ var CBIMiniDLNAStatus = form.DummyValue.extend({
 	}
 });
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-minidlna/htdocs/luci-static/resources/view/status/include/80_minidlna.js b/applications/luci-app-minidlna/htdocs/luci-static/resources/view/status/include/80_minidlna.js
index f67e5f84b5..55a78c0cb6 100644
--- a/applications/luci-app-minidlna/htdocs/luci-static/resources/view/status/include/80_minidlna.js
+++ b/applications/luci-app-minidlna/htdocs/luci-static/resources/view/status/include/80_minidlna.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require uci';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('miniDLNA Status'),
 
 	load: function() {
diff --git a/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js b/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js
index 9b3c7bfc41..0ad4a79825 100644
--- a/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js
+++ b/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js
@@ -1,9 +1,11 @@
 'use strict';
+'require view';
+'require poll';
 'require fs';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
-		L.Poll.add(function() {
+		poll.add(function() {
 			return L.resolveDefault(fs.exec('/sbin/logread', ['-e', 'nextdns']), { code: 1 })
 			.then(function(res) {
 				var content;
diff --git a/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/overview.js b/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/overview.js
index 2fd693f3e2..4899fda97b 100644
--- a/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/overview.js
+++ b/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/overview.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 		
diff --git a/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js b/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js
index 8a01b1db49..033f1f06c7 100644
--- a/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js
+++ b/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js
@@ -63,7 +63,7 @@ Chart.defaults.global.tooltipTemplate = function(tip) {
 
 function kpi(id, val1, val2, val3)
 {
-	var e = L.dom.elem(id) ? id : document.getElementById(id);
+	var e = dom.elem(id) ? id : document.getElementById(id);
 
 	if (val1 && val2 && val3)
 		e.innerHTML = _('%s, %s and %s').format(val1, val2, val3);
@@ -96,8 +96,8 @@ function pie(id, data)
 		}
 	}
 
-	var node = L.dom.elem(id) ? id : document.getElementById(id),
-	    key = L.dom.elem(id) ? id.id : id,
+	var node = dom.elem(id) ? id : document.getElementById(id),
+	    key = dom.elem(id) ? id.id : id,
 	    ctx = node.getContext('2d');
 
 	if (chartRegistry.hasOwnProperty(key))
@@ -279,7 +279,7 @@ function renderHostDetail(tooltip)
 
 	var rxData = [], txData = [];
 
-	L.dom.content(tooltip, [
+	dom.content(tooltip, [
 		E('div', { 'class': 'head' }, [
 			E('div', { 'class': 'pie' }, [
 				E('label', _('Download')),
diff --git a/applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js b/applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js
index cbc77f66ff..a74bb4cd60 100644
--- a/applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js
+++ b/applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js
@@ -2,10 +2,11 @@
 // This is free software, licensed under the Apache License, Version 2.0
 
 'use strict';
+'require view';
 'require form';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	render: function () {
 		var m, s, o;
 
diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
index b7a52d1d12..952f836765 100644
--- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
+++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require fs';
 'require ui';
 'require rpc';
@@ -995,7 +996,7 @@ function handleKeyUp(ev) {
 	}, 250);
 }
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return downloadLists();
 	},
diff --git a/applications/luci-app-pagekitec/htdocs/luci-static/resources/view/pagekitec.js b/applications/luci-app-pagekitec/htdocs/luci-static/resources/view/pagekitec.js
index 13161de7a8..9289bf3260 100644
--- a/applications/luci-app-pagekitec/htdocs/luci-static/resources/view/pagekitec.js
+++ b/applications/luci-app-pagekitec/htdocs/luci-static/resources/view/pagekitec.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require form';
 
 var desc = _(""
@@ -9,7 +10,7 @@ var desc = _(""
 	+ "some very very basic uses of pagekite.</em>"
 );
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js b/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
index 48779c91c1..7b6430b966 100644
--- a/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
+++ b/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
@@ -1,9 +1,10 @@
 'use strict';
+'require view';
 'require fs';
 'require form';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(fs.stat('/sbin/block'), null),
diff --git a/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/leds.js b/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/leds.js
index 1f85396f12..d1342cd7bb 100644
--- a/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/leds.js
+++ b/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/leds.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/proxies.js b/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/proxies.js
index 105f591c49..9e1c3c8f76 100644
--- a/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/proxies.js
+++ b/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/proxies.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/settings.js b/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/settings.js
index 68a113fb42..a93cc55e47 100644
--- a/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/settings.js
+++ b/applications/luci-app-ser2net/htdocs/luci-static/resources/view/ser2net/settings.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js
index 3d111d5791..ef93a1c754 100644
--- a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js
+++ b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js
@@ -1,4 +1,5 @@
 'use strict';
+'require baseclass';
 'require uci';
 'require form';
 'require network';
@@ -67,7 +68,7 @@ function ucival_to_bool(val) {
 	return val === 'true' || val === '1' || val === 'yes' || val === 'on';
 }
 
-return L.Class.extend({
+return baseclass.extend({
 	values_actions: function(o) {
 		o.value('bypass');
 		o.value('forward');
diff --git a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js
index 27a2b950c2..9a591d5962 100644
--- a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js
+++ b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js
@@ -1,4 +1,6 @@
 'use strict';
+'require view';
+'require poll';
 'require form';
 'require uci';
 'require fs';
@@ -16,7 +18,7 @@ var callServiceList = rpc.declare({
 	expect: { '': {} }
 });
 
-return L.view.extend({
+return view.extend({
 	render: function(stats) {
 		var m, s, o;
 
@@ -137,7 +139,7 @@ return L.view.extend({
 		}
 
 		return m.render().finally(function() {
-			L.Poll.add(function() {
+			poll.add(function() {
 				return L.resolveDefault(callServiceList(conf), {})
 				.then(function(res) {
 					var instances = null;
diff --git a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/rules.js b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/rules.js
index 798237adbd..4cb653e57e 100644
--- a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/rules.js
+++ b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/rules.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require uci';
 'require fs';
 'require form';
@@ -12,7 +13,7 @@ function src_dst_option(s /*, ... */) {
 	o.datatype = 'or(ipaddr,cidr)';
 }
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(fs.stat('/usr/lib/iptables/libxt_recent.so'), {}),
diff --git a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/servers.js b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/servers.js
index 5951e92e51..57756b83e6 100644
--- a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/servers.js
+++ b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/servers.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require form';
 'require uci';
 'require ui';
@@ -6,7 +7,7 @@
 
 var conf = 'shadowsocks-libev';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js
index 00b65d5b6d..092dd45522 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool.js
@@ -1,4 +1,5 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require uci';
 'require tools.prng as random';
@@ -133,7 +134,7 @@ var colors = L.Class.singleton({
 var rrdtree = {},
     graphdefs = {};
 
-return L.Class.extend({
+return baseclass.extend({
 	__init__: function() {
 		this.opts = {};
 	},
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/apcups.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/apcups.js
index 50de3a6b03..c03e38cf57 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/apcups.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/apcups.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('APC UPS'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/conntrack.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/conntrack.js
index c61d4f2912..9c54f5c914 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/conntrack.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/conntrack.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Conntrack'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/contextswitch.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/contextswitch.js
index fc4c80a93b..8dc3cc75fb 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/contextswitch.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/contextswitch.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Context Switches'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpu.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpu.js
index 4e130704aa..464b28e8ef 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpu.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpu.js
@@ -1,9 +1,10 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 'require uci';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Processor'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpufreq.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpufreq.js
index 6f4d52deb2..308d58dacf 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpufreq.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/cpufreq.js
@@ -1,9 +1,10 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 'require uci';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('CPU Frequency'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/curl.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/curl.js
index af78dd0b91..718aa7bbb6 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/curl.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/curl.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('cUrl'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/df.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/df.js
index 240d1da617..34fbb9b5c4 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/df.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/df.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Disk Space Usage'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/disk.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/disk.js
index 52542a1f84..12ed9568f6 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/disk.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/disk.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Disk Usage'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/dns.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/dns.js
index 9e71bb42c5..029471f801 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/dns.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/dns.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('DNS'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/entropy.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/entropy.js
index 574724c421..b4f6f05948 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/entropy.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/entropy.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Entropy'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/interface.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/interface.js
index 04b1b8d1ea..ccf1849243 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/interface.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/interface.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Interfaces'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ip6tables.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ip6tables.js
index 1b9755cce3..c956c19881 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ip6tables.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ip6tables.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Firewall (IPv6)'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iptables.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iptables.js
index a115c044b3..69a3a87eb7 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iptables.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iptables.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Firewall'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/irq.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/irq.js
index 158fbce9e3..29675f77c3 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/irq.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/irq.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Interrupts'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iwinfo.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iwinfo.js
index 9eeb1d0016..638242f102 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iwinfo.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/iwinfo.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Wireless'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/load.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/load.js
index 8b1e6c2844..a104691100 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/load.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/load.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('System Load'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/memory.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/memory.js
index 4c52fc7811..9b0d179b0a 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/memory.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/memory.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Memory'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/netlink.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/netlink.js
index f7d55a89db..3bf3756b04 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/netlink.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/netlink.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Netlink'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/nut.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/nut.js
index a9cb770c7d..5d7a92f7fb 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/nut.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/nut.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('UPS'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/olsrd.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/olsrd.js
index 4ccc417da7..b311efba36 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/olsrd.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/olsrd.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('OLSRd'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/openvpn.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/openvpn.js
index 08951018f4..f78e2a491c 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/openvpn.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/openvpn.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('OpenVPN'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ping.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ping.js
index 063db21895..27624828c2 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ping.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/ping.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Ping'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/processes.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/processes.js
index c117709701..9087b8e33c 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/processes.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/processes.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Processes'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js
index 72806df880..b3361e1bf4 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Sensors'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/splash_leases.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/splash_leases.js
index 64741f16e3..33df893f86 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/splash_leases.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/splash_leases.js
@@ -4,8 +4,9 @@
  */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Splash Leases'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/tcpconns.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/tcpconns.js
index 4ecd532fa0..626e2c64bc 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/tcpconns.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/tcpconns.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('TCP Connections'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/thermal.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/thermal.js
index 6ff303de98..a94c83bdf5 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/thermal.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/thermal.js
@@ -1,8 +1,9 @@
 /* Licensed to the public under the Apache License 2.0. */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Thermal'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/uptime.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/uptime.js
index c764897b54..2b6ea226a8 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/uptime.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/uptime.js
@@ -9,8 +9,9 @@ You may obtain a copy of the License at
 */
 
 'use strict';
+'require baseclass';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Uptime'),
 
 	rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/collectd.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/collectd.js
index d92693525a..282b867c4d 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/collectd.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/collectd.js
@@ -1,10 +1,12 @@
 'use strict';
+'require view';
+'require dom';
 'require fs';
 'require ui';
 'require uci';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			fs.list('/usr/lib/collectd'),
@@ -172,7 +174,7 @@ return L.view.extend({
 				var trEl = this.super('renderRowActions', [ section_id, _('Configure…') ]);
 
 				if (!plugin || !plugin.form.addFormOptions)
-					L.dom.content(trEl, null);
+					dom.content(trEl, null);
 
 				return trEl;
 			};
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js
index f1e69b89ce..838af8c661 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js
@@ -1,4 +1,7 @@
 'use strict';
+'require view';
+'require dom';
+'require poll';
 'require ui';
 'require uci';
 'require statistics.rrdtool as rrdtool';
@@ -7,7 +10,7 @@ var pollFn = null,
     activePlugin = null,
     activeInstance = null;
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return rrdtool.load();
 	},
@@ -22,7 +25,7 @@ return L.view.extend({
 
 		activePlugin = plugin;
 
-		L.dom.content(container, [
+		dom.content(container, [
 			E('p', {}, [
 				E('em', { 'class': 'spinning' }, [ _('Loading data…') ])
 			])
@@ -52,7 +55,7 @@ return L.view.extend({
 		})).then(function(blobs) {
 			var multiple = blobs.length > 1;
 
-			L.dom.content(container, E('div', {}, blobs.map(function(blobs, i) {
+			dom.content(container, E('div', {}, blobs.map(function(blobs, i) {
 				var plugin_instance = i ? plugin_instances[i-1] : plugin_instances.join('|'),
 				    title = '%s: %s'.format(rrdtool.pluginTitle(plugin), i ? plugin_instance : _('Overview'));
 
@@ -85,7 +88,7 @@ return L.view.extend({
 			URL.revokeObjectURL(img.src);
 		});
 
-		L.dom.content(container, null);
+		dom.content(container, null);
 
 		if (container.hasAttribute('data-initialized')) {
 			container.removeAttribute('data-initialized');
@@ -147,13 +150,13 @@ return L.view.extend({
 		var btn = ev.currentTarget;
 
 		if (pollFn) {
-			L.Poll.remove(pollFn);
+			poll.remove(pollFn);
 			pollFn = null;
 		}
 
 		if (time.value != '0') {
 			pollFn = L.bind(this.refreshGraphs, this, host, span, time, container);
-			L.Poll.add(pollFn, +time.value);
+			poll.add(pollFn, +time.value);
 		}
 	},
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
index b4f170c8a7..89b861a84b 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('APCUPS Plugin Configuration'),
 	description: _('The APCUPS plugin collects statistics about the APC UPS.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/conntrack.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/conntrack.js
index 23f14e846c..ac859c8553 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/conntrack.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/conntrack.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Conntrack Plugin Configuration'),
 	description: _('The conntrack plugin collects statistics about the number of tracked connections.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/contextswitch.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/contextswitch.js
index f4e30fe354..d978a556c2 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/contextswitch.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/contextswitch.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('CPU Context Switches Plugin Configuration'),
 	description: _('This plugin collects statistics about the processor context switches.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpu.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpu.js
index 3a27a67dfe..7b2963cad2 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpu.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpu.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('CPU Plugin Configuration'),
 	description: _('The cpu plugin collects basic statistics about the processor usage.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpufreq.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpufreq.js
index 64c260877c..636ac8f7c7 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpufreq.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/cpufreq.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('CPU Frequency Plugin Configuration'),
 	description: _('This plugin collects statistics about the processor frequency scaling.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/csv.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/csv.js
index 244a07be27..87d8c9f6b7 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/csv.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/csv.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('CSV Plugin Configuration'),
 	description: _('The csv plugin stores collected data in csv file format for further processing by external programs.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/curl.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/curl.js
index c49c475c6b..60a167c244 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/curl.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/curl.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('cUrl Plugin Configuration'),
 
 	addFormOptions: function(s) {
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/df.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/df.js
index 7b063869b2..9e3dc5630a 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/df.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/df.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('DF Plugin Configuration'),
 	description: _('The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/disk.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/disk.js
index c737a7dbe2..c36df10258 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/disk.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/disk.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Disk Plugin Configuration'),
 	description: _('The disk plugin collects detailed usage statistics for selected partitions or whole disks.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js
index 27b08cf393..8ff7052980 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/dns.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('DNS Plugin Configuration'),
 	description: _('The dns plugin collects detailed statistics about dns related traffic on selected interfaces.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js
index 5306dd4cea..51f8284e48 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/email.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('E-Mail Plugin Configuration'),
 	description: _('The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/entropy.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/entropy.js
index cf15d98a30..ffe679194a 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/entropy.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/entropy.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Entropy Plugin Configuration'),
 	description: _('The entropy plugin collects statistics about the available entropy.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/exec.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/exec.js
index ff1a5a0ad9..d197144271 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/exec.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/exec.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Exec Plugin Configuration'),
 	description: _('The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js
index 1d60d644fd..cb4d680b21 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/interface.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Interface Plugin Configuration'),
 	description: _('The interface plugin collects traffic statistics on selected interfaces.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iptables.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iptables.js
index 34b75f9284..6dcaf26de6 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iptables.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iptables.js
@@ -1,9 +1,10 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require uci';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Iptables Plugin Configuration'),
 	description: _('The iptables plugin will monitor selected firewall rules and collect information about processed bytes and packets per rule.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/irq.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/irq.js
index 0061c4dfd4..4271a8f819 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/irq.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/irq.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('IRQ Plugin Configuration'),
 	description: _('The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iwinfo.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iwinfo.js
index 3f99872366..868c1f3035 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iwinfo.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/iwinfo.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Wireless iwinfo Plugin Configuration'),
 	description: _('The iwinfo plugin collects statistics about wireless signal strength, noise and quality.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/load.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/load.js
index be6aba44cd..25755637c8 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/load.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/load.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Load Plugin Configuration'),
 	description: _('The load plugin collects statistics about the general system load.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js
index fdd55f0cf5..a4a8eb2761 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Memory Plugin Configuration'),
 	description: _('The memory plugin collects statistics about the memory usage.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/netlink.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/netlink.js
index 3797b690ad..8910206929 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/netlink.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/netlink.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Netlink Plugin Configuration'),
 	description: _('The netlink plugin collects extended information like qdisc-, class- and filter-statistics for selected interfaces.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/network.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/network.js
index 5419e6d34f..2429b8ac77 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/network.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/network.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Network Plugin Configuration'),
 	description: _('The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected data is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js
index 7148ed1124..ca20e11721 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('UPS Plugin Configuration'),
 	description: _('The NUT plugin reads information about Uninterruptible Power Supplies.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/olsrd.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/olsrd.js
index 973c0858f3..4e6eca2344 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/olsrd.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/olsrd.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('OLSRd Plugin Configuration'),
 	description: _('The OLSRd plugin reads information about meshed networks from the txtinfo plugin of OLSRd.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js
index b0704fc722..b48ed93a32 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('OpenVPN Plugin Configuration'),
 	description: _('The OpenVPN plugin gathers information about the current vpn connection status.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js
index 07f0f50947..33ef8e2b41 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/ping.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Ping Plugin Configuration'),
 	description: _('The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/processes.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/processes.js
index e2331998a5..d29ac87630 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/processes.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/processes.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Processes Plugin Configuration'),
 	description: _('The processes plugin collects information like cpu time, page faults and memory usage of selected processes.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js
index 6e0b8e6a24..4d0520471c 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/rrdtool.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('RRDTool Plugin Configuration'),
 	description: _('The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js
index cda59a2a91..8424966d2d 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js
@@ -1,4 +1,5 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require form';
 
@@ -10,7 +11,7 @@ var sensorTypes = [
 	/^(?:power)[0-9]*$/,										'power'
 ];
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Sensors Plugin Configuration'),
 	description: _('The sensors plugin uses the Linux Sensors framework to gather environmental statistics.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/splash_leases.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/splash_leases.js
index 9db7388608..6ab5196186 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/splash_leases.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/splash_leases.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Splash Leases Plugin Configuration'),
 	description: _('The splash leases plugin uses libuci to collect statistics about splash leases.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js
index 9162418799..3bab72776b 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/tcpconns.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('TCPConns Plugin Configuration'),
 	description: _('The tcpconns plugin collects information about open tcp connections on selected ports.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/thermal.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/thermal.js
index c2def46098..650e54747a 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/thermal.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/thermal.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require fs';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Thermal Plugin Configuration'),
 	description: _('The thermal plugin will monitor temperature of the system. Data is typically read from /sys/class/thermal/*/temp ( \'*\' denotes the thermal device to be read, e.g. thermal_zone1 )'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js
index c2f33a0a14..996cfda45c 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js
@@ -1,8 +1,9 @@
 'use strict';
+'require baseclass';
 'require form';
 'require tools.widgets as widgets';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Unixsock Plugin Configuration'),
 	description: _('The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.'),
 
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/uptime.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/uptime.js
index c31cfd2e90..2c42708ef6 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/uptime.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/uptime.js
@@ -1,7 +1,8 @@
 'use strict';
+'require baseclass';
 'require form';
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Uptime Plugin Configuration'),
 	description: _('The uptime plugin collects statistics about the uptime of the system.'),
 
diff --git a/applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js b/applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js
index dfbd9af6cb..aecb4ecaa7 100644
--- a/applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js
+++ b/applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require fs';
 'require uci';
 'require rpc';
@@ -17,7 +18,7 @@ function setFlagBool(o) {
 	o.disabled = 'false';
 }
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(callServiceList('transmission')),
diff --git a/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/config.js b/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/config.js
index e92880d53c..9934ecebd7 100644
--- a/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/config.js
+++ b/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/config.js
@@ -1,8 +1,9 @@
 'use strict';
+'require view';
 'require form';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/term.js b/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/term.js
index 4725f7a5bc..26756a3692 100644
--- a/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/term.js
+++ b/applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/term.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require uci';
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return uci.load('ttyd');
 	},
diff --git a/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js b/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
index b1a2531c86..608929c700 100644
--- a/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
+++ b/applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
@@ -1,4 +1,6 @@
 'use strict';
+'require baseclass';
+'require dom';
 'require rpc';
 'require uci';
 
@@ -18,14 +20,14 @@ callUpnpDeleteRule = rpc.declare({
 });
 
 handleDelRule = function(num, ev) {
-	L.dom.parent(ev.currentTarget, '.tr').style.opacity = 0.5;
+	dom.parent(ev.currentTarget, '.tr').style.opacity = 0.5;
 	ev.currentTarget.classList.add('spinning');
 	ev.currentTarget.disabled = true;
 	ev.currentTarget.blur();
 	callUpnpDeleteRule(num);
 };
 
-return L.Class.extend({
+return baseclass.extend({
 	title: _('Active UPnP Redirects'),
 
 	load: function() {
diff --git a/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js b/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
index cfd1e3508a..095078a4e2 100644
--- a/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
+++ b/applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
@@ -1,4 +1,7 @@
 'use strict';
+'require view';
+'require dom';
+'require poll';
 'require uci';
 'require rpc';
 'require form';
@@ -26,14 +29,14 @@ callUpnpDeleteRule = rpc.declare({
 });
 
 handleDelRule = function(num, ev) {
-	L.dom.parent(ev.currentTarget, '.tr').style.opacity = 0.5;
+	dom.parent(ev.currentTarget, '.tr').style.opacity = 0.5;
 	ev.currentTarget.classList.add('spinning');
 	ev.currentTarget.disabled = true;
 	ev.currentTarget.blur();
 	callUpnpDeleteRule(num);
 };
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			callUpnpGetStatus(),
@@ -190,7 +193,7 @@ return L.view.extend({
 		o.value('deny')
 
 		return m.render().then(L.bind(function(m, nodes) {
-			L.Poll.add(L.bind(function() {
+			poll.add(L.bind(function() {
 				return Promise.all([
 					callUpnpGetStatus()
 				]).then(L.bind(this.poll_status, this, nodes));
diff --git a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
index 0b01239799..14e968a071 100644
--- a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
+++ b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
@@ -1,13 +1,14 @@
 // This is free software, licensed under the Apache License, Version 2.0
 
 'use strict';
+'require view';
 'require fs';
 'require ui';
 'require uci';
 'require form';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	handleDeleteModal: function(m, iface, ev) {
 		L.showModal(_('Delete interface <em>%h</em>').format(iface), [
 			E('p', _('The interface will be removed from the database permanently. This cannot be undone.')),
diff --git a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js
index 770884655a..fbe9d59337 100644
--- a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js
+++ b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js
@@ -1,10 +1,11 @@
 // This is free software, licensed under the Apache License, Version 2.0
 
 'use strict';
+'require view';
 'require fs';
 'require ui';
 
-return L.view.extend({
+return view.extend({
 	renderTab: function(ifaces, style, title) {
 		var tab = E('div', {
 			'class': 'cbi-section',
diff --git a/applications/luci-app-wol/htdocs/luci-static/resources/view/wol.js b/applications/luci-app-wol/htdocs/luci-static/resources/view/wol.js
index cafed753c9..f3b363d60a 100644
--- a/applications/luci-app-wol/htdocs/luci-static/resources/view/wol.js
+++ b/applications/luci-app-wol/htdocs/luci-static/resources/view/wol.js
@@ -1,4 +1,6 @@
 'use strict';
+'require view';
+'require dom';
 'require uci';
 'require fs';
 'require ui';
@@ -6,7 +8,7 @@
 'require form';
 'require tools.widgets as widgets';
 
-return L.view.extend({
+return view.extend({
 	formdata: { wol: {} },
 
 	callHostHints: rpc.declare({
@@ -82,7 +84,7 @@ return L.view.extend({
 		var map = document.querySelector('#maincontent .cbi-map'),
 		    data = this.formdata;
 
-		return L.dom.callClassMethod(map, 'save').then(function() {
+		return dom.callClassMethod(map, 'save').then(function() {
 			if (!data.wol.mac)
 				return alert(_('No target host specified!'));
 
diff --git a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js
index 8bc79321fd..44acaa22d6 100644
--- a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js
+++ b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js
index 62336a2708..7d392901c5 100644
--- a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js
+++ b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js
index 4a91d5e02f..45fe2207b2 100644
--- a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js
+++ b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js
index 52d79a47ea..4278386f53 100644
--- a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js
+++ b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;
 
diff --git a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/status.js b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/status.js
index 3fb6c1f7fa..35078a511b 100644
--- a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/status.js
+++ b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/status.js
@@ -1,4 +1,5 @@
 'use strict';
+'require view';
 'require fs';
 'require form';
 
@@ -65,7 +66,7 @@ function update_active_peers() {
 	});
 }
 
-return L.view.extend({
+return view.extend({
 	load: function() {
 		return Promise.all([
 			L.resolveDefault(fs.stat("/usr/sbin/yggdrasilctl"), null),
diff --git a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js
index 77cfbc2dce..0b4ac6e51a 100644
--- a/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js
+++ b/applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js
@@ -1,7 +1,8 @@
 'use strict';
+'require view';
 'require form';
 
-return L.view.extend({
+return view.extend({
 	render: function() {
 		var m, s, o;