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

Implement method that reads vendor libs from core.json 

* includes them at the beginning of initTemplate()
This commit is contained in:
Morris Jobke 2014-11-04 15:28:50 +01:00
parent d367d1b06a
commit 9f30d3529a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/base.php
View File

@ -336,15 +336,25 @@ class OC {
public static function initTemplateEngine() { public static function initTemplateEngine() {
// Add the stuff we need always // Add the stuff we need always
// TODO: read from core/js/core.json
OC_Util::addVendorScript('jquery/jquery.min'); // following logic will import all vendor libraries that are
OC_Util::addVendorScript('jquery/jquery-migrate.min'); // specified in core/js/core.json
OC_Util::addVendorScript('jquery-ui/ui/jquery-ui.custom'); $fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
if($fileContent !== false) {
$coreDependencies = json_decode($fileContent, true);
foreach($coreDependencies['vendor'] as $vendorLibrary) {
// remove trailing ".js" as addVendorScript will append it
OC_Util::addVendorScript(
substr($vendorLibrary, 0, strlen($vendorLibrary) - 3));
}
} else {
throw new \Exception('Cannot read core/js/core.json');
}
OC_Util::addScript("jquery-showpassword"); OC_Util::addScript("jquery-showpassword");
OC_Util::addScript("placeholders"); OC_Util::addScript("placeholders");
OC_Util::addScript("jquery-tipsy"); OC_Util::addScript("jquery-tipsy");
OC_Util::addScript("compatibility"); OC_Util::addScript("compatibility");
OC_Util::addVendorScript("underscore/underscore");
OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("jquery.ocdialog");
OC_Util::addScript("oc-dialogs"); OC_Util::addScript("oc-dialogs");
OC_Util::addScript("js"); OC_Util::addScript("js");
@ -358,7 +368,6 @@ class OC {
OC_Util::addScript("oc-requesttoken"); OC_Util::addScript("oc-requesttoken");
OC_Util::addScript("apps"); OC_Util::addScript("apps");
OC_Util::addVendorScript('snapjs/dist/latest/snap'); OC_Util::addVendorScript('snapjs/dist/latest/snap');
OC_Util::addVendorScript('moment/min/moment-with-locales');
// avatars // avatars
if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) { if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {