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

Merge pull request #4043 from nextcloud/merge-js-for-template-prepend 

Merge JS for template prepend
This commit is contained in:
Morris Jobke 2017-03-24 15:42:08 -06:00 committed by GitHub
parent 8aedebff22 6a470e5935
commit 2f7669179e
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/js/merged-template-prepend.json Normal file
View File

@ -0,0 +1,17 @@
[
"jquery.ocdialog.js",
"oc-dialogs.js",
"js.js",
"l10n.js",
"octemplate.js",
"eventsource.js",
"public/appconfig.js",
"config.js",
"oc-requesttoken.js",
"apps.js",
"mimetype.js",
"mimetypelist.js",
"oc-backbone.js",
"placeholder.js",
"jquery.avatar.js"
]

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

@ -109,31 +109,12 @@ class OC_Template extends \OC\Template\Base {
OC_Util::addStyle('jquery-ui-fixes',null,true);
OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
OC_Util::addStyle('server', null, true);
// avatars
\OC_Util::addScript('jquery.avatar', null, true);
\OC_Util::addScript('placeholder', null, true);
OC_Util::addVendorStyle('select2/select2', null, true);
OC_Util::addScript('select2-toggleselect');
OC_Util::addScript('oc-backbone', null, true);
OC_Util::addScript('mimetypelist', null, true);
OC_Util::addScript('mimetype', null, true);
OC_Util::addScript("apps", null, true);
OC_Util::addScript("oc-requesttoken", null, true);
OC_Util::addScript('search', 'search', true);
OC_Util::addScript("config", null, true);
OC_Util::addScript("public/appconfig", null, true);
OC_Util::addScript("eventsource", null, true);
OC_Util::addScript("octemplate", null, true);
OC_Util::addStyle('jquery.ocdialog');
OC_Util::addTranslations("core", null, true);
OC_Util::addScript("l10n", null, true);
OC_Util::addScript("js", null, true);
OC_Util::addScript("oc-dialogs", null, true);
OC_Util::addScript("jquery.ocdialog", null, true);
OC_Util::addScript("jquery-ui-fixes");
OC_Util::addStyle("jquery.ocdialog");
OC_Util::addScript('search', 'search', true);
OC_Util::addScript('merged-template-prepend', null, true);
OC_Util::addScript('jquery-ui-fixes');
OC_Util::addScript('files/fileinfo');
OC_Util::addScript('files/client');