From 5370b98936418b2b548c023813039b8bf2074a55 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Apr 2018 17:31:56 +0200
Subject: [inc/Module] Overhaul dependency loading and handling of js/css

This is supposed to prevent unneeded js/css from being pulled in
---
 modules-available/js_chart/config.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules-available/js_chart/config.json')

diff --git a/modules-available/js_chart/config.json b/modules-available/js_chart/config.json
index de4d37b4..3cf0d162 100644
--- a/modules-available/js_chart/config.json
+++ b/modules-available/js_chart/config.json
@@ -1,8 +1,9 @@
 {
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 1f18997b2d72a5aea772f0f9d6ddb61718fbd380 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 27 Apr 2018 14:00:57 +0200
Subject: Don't try to load non-existent style.css/clientscript.js

---
 inc/module.inc.php                           | 4 ++--
 modules-available/js_chart/config.json       | 3 ---
 modules-available/js_circles/config.json     | 3 ---
 modules-available/js_moment/config.json      | 3 ---
 modules-available/js_stupidtable/config.json | 3 ---
 5 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'modules-available/js_chart/config.json')

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"
 	],
-- 
cgit v1.2.3-55-g7522