mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update select2, include css 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2018-12-23 15:09:40 +01:00 committed by Julius Härtl
parent a34027348b
commit 83068c39e5
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
6 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/js/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

1
core/src/globals.js
View File

@ -43,6 +43,7 @@ import marked from 'marked'
import md5 from 'blueimp-md5'
import moment from 'moment'
import Select2 from 'select2'
import 'select2/select2.css'
import 'snap.js/dist/snap'
import 'strengthify'
import 'strengthify/strengthify.css'

1
lib/private/legacy/template.php
View File

@ -112,7 +112,6 @@ class OC_Template extends \OC\Template\Base {
OC_Util::addStyle('css-variables', null, true);
OC_Util::addStyle('server', null, true);
OC_Util::addStyle('jquery-ui-fixes',null,true);
OC_Util::addVendorStyle('select2/select2', null, true);
OC_Util::addStyle('jquery.ocdialog');
OC_Util::addTranslations("core", null, true);
OC_Util::addStyle('search', 'results');

4
package-lock.json generated
View File

@ -970,6 +970,10 @@
"resolved": "https://registry.npmjs.org/Base64/-/Base64-0.3.0.tgz",
"integrity": "sha1-baJhpOgNT6D1xoQlTlvM0Wu9zp8="
},
"Select2": {
"version": "git+https://github.com/select2/select2.git#b5f3b2839c48c53f9641d6bb1bccafc5260c7620",
"from": "git+https://github.com/select2/select2.git#3.4.8"
},
"acorn": {
"version": "5.7.3",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",

1
package.json
View File

@ -21,6 +21,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"Base64": "^0.3.0",
"Select2": "git+https://github.com/select2/select2.git#3.4.8",
"autosize": "^4.0.2",
"backbone": "^1.2.3",
"blueimp-md5": "^2.7.0",