From a427e130ae15a0d66d2c6221b853ca76e04ecede Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 22 Mar 2017 08:58:28 +0100 Subject: When debug don't load the bundled file Signed-off-by: Roeland Jago Douma --- lib/private/legacy/template.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'lib/private/legacy/template.php') diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 6f234a08e30..3f6bfe586db 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -137,8 +137,25 @@ class OC_Template extends \OC\Template\Base { OC_Util::addScript('files/fileinfo'); OC_Util::addScript('files/client'); - // Import all (combined) default vendor libraries - OC_Util::addVendorScript('core', null, true); + 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, strlen($vendorLibrary) - 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); + } if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) { // polyfill for btoa/atob for IE friends -- cgit v1.2.3