Merge pull request #31498 from owncloud/move-select2-to-core

Move select2 lib to core
owncloud · May 23, 2018 · c6cd4ae · c6cd4ae
2 parents 846b08f + 0863f3a
commit c6cd4ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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);