diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-24 10:49:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 10:49:57 +0100 |
| commit | f94bc6f8bb8d0b86441362c21d49304f31a02c0c (patch) | |
| tree | 443d4ea3091ef63c827bd243a5e720728b238a68 /lib | |
| parent | df4d1f7b78d54448061c6bc27c1aff4275c9cdf3 (diff) | |
| parent | 03d688d6acdaecdb59e04a8acef6d63edc174e37 (diff) | |
| download | nextcloud-server-f94bc6f8bb8d0b86441362c21d49304f31a02c0c.tar.gz nextcloud-server-f94bc6f8bb8d0b86441362c21d49304f31a02c0c.zip | |
Merge pull request #4013 from nextcloud/bundle_vendor_js
Bundle vendor js
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/legacy/template.php | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 06632de2847..3f6bfe586db 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -114,12 +114,10 @@ class OC_Template extends \OC\Template\Base { \OC_Util::addScript('jquery.avatar', null, true); \OC_Util::addScript('placeholder', null, true); - OC_Util::addVendorScript('select2/select2'); OC_Util::addVendorStyle('select2/select2', null, true); OC_Util::addScript('select2-toggleselect'); OC_Util::addScript('oc-backbone', null, true); - OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true); OC_Util::addScript('mimetypelist', null, true); OC_Util::addScript('mimetype', null, true); OC_Util::addScript("apps", null, true); @@ -139,19 +137,24 @@ class OC_Template extends \OC\Template\Base { OC_Util::addScript('files/fileinfo'); OC_Util::addScript('files/client'); - // 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( + 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 { - throw new \Exception('Cannot read core/js/core.json'); + // Import all (combined) default vendor libraries + OC_Util::addVendorScript('core', null, true); } if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) { |