From 3e5e07aa64f94bea528450d810249c74d0f8c03f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Thu, 20 Oct 2016 18:29:57 +0200
Subject: [PATCH] Template css order Select2 systemtags removal Settings again
Fix Script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
apps/systemtags/appinfo/app.php | 3 ---
apps/systemtags/templates/admin.php | 2 --
lib/private/legacy/template.php | 6 +++++-
settings/templates/admin/frame.php | 2 --
settings/templates/apps.php | 9 +--------
5 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php
index af91e5fdbcd..e3be0d7556e 100644
--- a/apps/systemtags/appinfo/app.php
+++ b/apps/systemtags/appinfo/app.php
@@ -31,9 +31,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');
\OCP\Util::addScript('systemtags/systemtagmodel');
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index 883e998ed61..de97b283d09 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -19,8 +19,6 @@
*
*/
-vendor_script('core', 'select2/select2');
-vendor_style('core', 'select2/select2');
script('core', [
'oc-backbone-webdav',
'systemtags/systemtags',
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index b43b4da839a..7520ffd44ed 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -117,7 +117,7 @@ class OC_Template extends \OC\Template\Base {
OC_Util::addStyle("fonts",null,true);
OC_Util::addStyle("icons",null,true);
OC_Util::addStyle("header",null,true);
- OC_Util::addStyle("inputs",null,true);
+ OC_Util::addStyle("inputs");
OC_Util::addStyle("styles",null,true);
// avatars
@@ -126,6 +126,10 @@ class OC_Template extends \OC\Template\Base {
\OC_Util::addScript('placeholder', null, true);
}
+ OC_Util::addVendorScript('select2/select2');
+ OC_Util::addVendorStyle('select2/select2', null, true);
+ OC_Util::addScript('select2-toggleselect');
+
OC_Util::addScript('oc-backbone', null, true);
OC_Util::addVendorScript('core', 'backbone/backbone', true);
OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true);
diff --git a/settings/templates/admin/frame.php b/settings/templates/admin/frame.php
index 1d9f6dc7a78..761d76c4434 100644
--- a/settings/templates/admin/frame.php
+++ b/settings/templates/admin/frame.php
@@ -25,8 +25,6 @@ style('settings', 'settings');
script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
script('core', ['multiselect', 'setupchecks']);
script('files', 'jquery.fileupload');
-vendor_script('select2/select2');
-vendor_style('select2/select2');
?>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index ea62acd9945..46fd5bd0e40 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -1,16 +1,9 @@
<?php
style('settings', 'settings');
-vendor_style(
- 'core',
- [
- 'select2/select2',
- ]
-);
vendor_script(
'core',
[
- 'handlebars/handlebars',
- 'select2/select2'
+ 'handlebars/handlebars'
]
);
script(
--
GitLab