diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-24 15:42:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 15:42:08 -0600 |
| commit | 2f7669179e8d8d0469803940097302cf255a9cdf (patch) | |
| tree | a7b0a404f95d8b8bcc586ccabee46fe66c7fbd2a | |
| parent | 8aedebff22b99e569735946ea709c6f0c1e4459d (diff) | |
| parent | 6a470e59356b8c52115fe2790666027f38977604 (diff) | |
| download | nextcloud-server-2f7669179e8d8d0469803940097302cf255a9cdf.tar.gz nextcloud-server-2f7669179e8d8d0469803940097302cf255a9cdf.zip | |
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
Merge JS for template prepend
| -rw-r--r-- | core/js/merged-template-prepend.json | 17 | ||||
| -rw-r--r-- | lib/private/legacy/template.php | 27 |
2 files changed, 21 insertions, 23 deletions
diff --git a/core/js/merged-template-prepend.json b/core/js/merged-template-prepend.json new file mode 100644 index 00000000000..12b7ca8faa3 --- /dev/null +++ b/core/js/merged-template-prepend.json @@ -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" +] diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 3f6bfe586db..969f5174278 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -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'); |