From 0863f3ad258045cec5190f855d3b71eb19c8b235 Mon Sep 17 00:00:00 2001 From: Felix Heidecke Date: Tue, 22 May 2018 13:44:26 +0200 Subject: [PATCH] Move select2 lib to core --- apps/systemtags/appinfo/app.php | 4 ---- lib/private/legacy/template.php | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index ad407e097128..49788ed23a55 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -28,10 +28,6 @@ $eventDispatcher->addListener( 'OCA\Files::loadAdditionalScripts', function () { - // FIXME: no public API for these ? - \OC_Util::addVendorScript('select2/select2'); - \OC_Util::addVendorStyle('select2/select2'); - \OCP\Util::addScript('select2-toggleselect'); \OCP\Util::addScript('oc-backbone-webdav'); \OCP\Util::addScript('systemtags/systemtags'); diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index bcf591468843..06f7701624e2 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -112,7 +112,6 @@ public static function initTemplateEngine($renderAs) { OC_Util::addStyle("tooltip", null, true); OC_Util::addStyle('jquery-ui-fixes', null, true); OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui', null, true); - OC_Util::addVendorStyle('select2/select2', null, true); OC_Util::addStyle("mobile", null, true); OC_Util::addStyle("multiselect", null, true); OC_Util::addStyle("fixes", null, true); @@ -132,6 +131,8 @@ public static function initTemplateEngine($renderAs) { OC_Util::addScript('oc-backbone', null, true); OC_Util::addVendorScript('core', 'backbone/backbone', true); + OC_Util::addVendorScript('core', 'select2/select2', true); + OC_Util::addVendorStyle('select2/select2', null, true); OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true); OC_Util::addScript('mimetypelist', null, true); OC_Util::addScript('mimetype', null, true);