diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-22 08:58:28 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-22 08:58:28 +0100 |
| commit | a427e130ae15a0d66d2c6221b853ca76e04ecede (patch) | |
| tree | 5539237e4d7938b81e59e1b732212738647ca9f0 | |
| parent | 1f7b86297aaccdd13d4e6ddd0b7b9606743d1c2e (diff) | |
| download | nextcloud-server-a427e130ae15a0d66d2c6221b853ca76e04ecede.tar.gz nextcloud-server-a427e130ae15a0d66d2c6221b853ca76e04ecede.zip | |
When debug don't load the bundled file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | lib/private/legacy/template.php | 21 |
1 files changed, 19 insertions, 2 deletions
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 |