diff options
| author | Simon Rettberg | 2018-04-27 14:00:57 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-04-27 14:00:57 +0200 |
| commit | 1f18997b2d72a5aea772f0f9d6ddb61718fbd380 (patch) | |
| tree | 2203e622952c64a44a649c6d611e4356af9abd81 | |
| parent | [locations] Restore row with unassigned machines (diff) | |
| download | slx-admin-1f18997b2d72a5aea772f0f9d6ddb61718fbd380.tar.gz slx-admin-1f18997b2d72a5aea772f0f9d6ddb61718fbd380.tar.xz slx-admin-1f18997b2d72a5aea772f0f9d6ddb61718fbd380.zip | |
Don't try to load non-existent style.css/clientscript.js
| -rw-r--r-- | inc/module.inc.php | 4 | ||||
| -rw-r--r-- | modules-available/js_chart/config.json | 3 | ||||
| -rw-r--r-- | modules-available/js_circles/config.json | 3 | ||||
| -rw-r--r-- | modules-available/js_moment/config.json | 3 | ||||
| -rw-r--r-- | modules-available/js_stupidtable/config.json | 3 |
5 files changed, 2 insertions, 14 deletions
diff --git a/inc/module.inc.php b/inc/module.inc.php index fa2c4b98..6d160787 100644 --- a/inc/module.inc.php +++ b/inc/module.inc.php @@ -283,7 +283,7 @@ class Module public function getScripts() { if ($this->directActivation && $this->clientPlugin) { - if (!in_array('clientscript.js', $this->scripts)) { + if (!in_array('clientscript.js', $this->scripts) && file_exists($this->getDir() . '/clientscript.js')) { $this->scripts[] = 'clientscript.js'; } return $this->scripts; @@ -294,7 +294,7 @@ class Module public function getCss() { if ($this->directActivation && $this->clientPlugin) { - if (!in_array('style.css', $this->css)) { + if (!in_array('style.css', $this->css) && file_exists($this->getDir() . '/style.css')) { $this->css[] = 'style.css'; } return $this->css; diff --git a/modules-available/js_chart/config.json b/modules-available/js_chart/config.json index 3cf0d162..5adc886f 100644 --- a/modules-available/js_chart/config.json +++ b/modules-available/js_chart/config.json @@ -1,7 +1,4 @@ { - "css": [ - "style.css" - ], "scripts": [ "clientscript.js" ], diff --git a/modules-available/js_circles/config.json b/modules-available/js_circles/config.json index 3cf0d162..5adc886f 100644 --- a/modules-available/js_circles/config.json +++ b/modules-available/js_circles/config.json @@ -1,7 +1,4 @@ { - "css": [ - "style.css" - ], "scripts": [ "clientscript.js" ], diff --git a/modules-available/js_moment/config.json b/modules-available/js_moment/config.json index 69bb0aa9..96c02bce 100644 --- a/modules-available/js_moment/config.json +++ b/modules-available/js_moment/config.json @@ -1,8 +1,5 @@ { "dependencies": [], - "css": [ - "style.css" - ], "scripts": [ "clientscript.js" ], diff --git a/modules-available/js_stupidtable/config.json b/modules-available/js_stupidtable/config.json index 3cf0d162..5adc886f 100644 --- a/modules-available/js_stupidtable/config.json +++ b/modules-available/js_stupidtable/config.json @@ -1,7 +1,4 @@ { - "css": [ - "style.css" - ], "scripts": [ "clientscript.js" ], |