mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When debug don't load the bundled file 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-03-22 08:58:28 +01:00
parent 1f7b86297a
commit a427e130ae
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/legacy/template.php
View File

@ -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