Remove core.js

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Dec 20, 2018 · 44c50a2 · 44c50a2
1 parent 033c057
commit 44c50a2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 97 deletions.
diff --git a/build/mergejs.php b/build/mergejs.php
diff --git a/build/mergejschecker.sh b/build/mergejschecker.sh
diff --git a/core/js/core.json b/core/js/core.json
@@ -1,7 +1,4 @@
 {
-	"vendor": [
-		"css-vars-ponyfill/dist/css-vars-ponyfill.min.js"
-	],
 	"libraries": [
 		"jquery-showpassword.js",
 		"jquery.avatar.js",

diff --git a/core/vendor/core.js b/core/vendor/core.js
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
@@ -124,26 +124,6 @@ public static function initTemplateEngine($renderAs) {
 			OC_Util::addScript('files/client');
 			OC_Util::addScript('contactsmenu');
 			OC_Util::addScript('contactsmenu_templates');
-
-			if (\OC::$server->getConfig()->getSystemValue('debug')) {
-				// Add the stuff we need always
-				// following logic will import all vendor libraries that are
-				// specified in core/js/core.json
-				$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
-				if($fileContent !== false) {
-					$coreDependencies = json_decode($fileContent, true);
-					foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
-						//remove trailing ".js" as addVendorScript will append it
-						OC_Util::addVendorScript(
-							substr($vendorLibrary, 0, -3),null,true);
-						}
- 				} else {
-					throw new \Exception('Cannot read core/js/core.json');
-				}
-			} else {
-				// Import all (combined) default vendor libraries
-				OC_Util::addVendorScript('core', null, true);
-			}
 			OC_Util::addScript('core', 'dist/main', true);
 
 			if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {