treewide: import utility classes explicitly

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

64 files changed, 137 insertions, 70 deletions

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.'),