upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-27 01:00:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge pull request #20949 from nextcloud/dependachristoph/npm_and_yarn/jquery-2.2.4

Browse source 
Bump jQuery to v2.2
This commit is contained in:
Christoph Wurst 2020-05-14 14:26:12 +02:00 committed by GitHub
commit d6bb0911ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/files/js/dist/sidebar.js vendored
View file

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/sidebar.js.map vendored
View file

File diff suppressed because one or more lines are too long

20
core/js/dist/install.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/install.js.map vendored
View file

File diff suppressed because one or more lines are too long

16
core/js/dist/login.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js.map vendored
View file

File diff suppressed because one or more lines are too long

18
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

24
core/js/dist/maintenance.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/js/dist/maintenance.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
core/src/globals.js
View file

@ -101,7 +101,7 @@ const setDeprecatedProp = (global, cb, msg) => {
}
window['_'] = _
setDeprecatedProp(['$', 'jQuery'], () => $, 'The global jQuery is deprecated. It will be updated to v2.4 in Nextcloud 20 and v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.')
setDeprecatedProp(['$', 'jQuery'], () => $, 'The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.')
setDeprecatedProp('autosize', () => autosize, 'please ship your own, this will be removed in Nextcloud 20')
setDeprecatedProp('Backbone', () => Backbone, 'please ship your own, this will be removed in Nextcloud 20')
setDeprecatedProp(['Clipboard', 'ClipboardJS'], () => ClipboardJS, 'please ship your own, this will be removed in Nextcloud 20')

6
package-lock.json generated
View file

@ -6424,9 +6424,9 @@
}
},
"jquery": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz",
"integrity": "sha1-IoveaYoMYUMdwmMKahVPFYkNIxc="
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
},
"jquery-migrate": {
"version": "1.4.1",

2
package.json
View file

@ -50,7 +50,7 @@
"escape-html": "^1.0.3",
"handlebars": "^4.7.6",
"jcrop": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm3",
"jquery": "2.1.4",
"jquery": "2.2.4",
"jquery-migrate": "^1.4.1",
"jquery-ui": "^1.12.1",
"jquery-ui-dist": "^1.12.1",