sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1832 from nextcloud/select2-into-core 

Select2 into core
pull/1861/head
Lukas Reschke 2016-10-22 14:35:07 +07:00 committed by GitHub
parent 038d02a27d 3e5e07aa64
commit 1be6213ba4
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/systemtags/appinfo/app.php
Unescape Escape View File

@ -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');

2
apps/systemtags/templates/admin.php
Unescape Escape View File

@ -19,8 +19,6 @@
*
*/
vendor_script('core', 'select2/select2');
vendor_style('core', 'select2/select2');
script('core', [
'oc-backbone-webdav',
'systemtags/systemtags',

6
lib/private/legacy/template.php
Unescape Escape View File

@ -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);

2
settings/templates/admin/frame.php
Unescape Escape View File

@ -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');
?>

9
settings/templates/apps.php
Unescape Escape View File

@ -1,16 +1,9 @@
<?php
style('settings', 'settings');
vendor_style(
'core',
[
'select2/select2',
]
);
vendor_script(
'core',
[
'handlebars/handlebars',
'select2/select2'
'handlebars/handlebars'
]
);
script(