diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-07-31 09:40:53 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-07-31 11:00:33 +0200 |
commit | 3a31397ac29f71db5313ea0e819a1362a019b5cc (patch) | |
tree | c14a1b88ccf1c4a7c57b752314ceec9c0e38b183 /core/src | |
parent | a384b4a97a2a4444d8e2c831765dbf35c8da0db2 (diff) | |
download | nextcloud-server-3a31397ac29f71db5313ea0e819a1362a019b5cc.tar.gz nextcloud-server-3a31397ac29f71db5313ea0e819a1362a019b5cc.zip |
Use `babel-loader-exclude-node-modules-except`
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/OCP/loader.js | 4 | ||||
-rw-r--r-- | core/src/components/setup/RecommendedApps.vue | 2 | ||||
-rw-r--r-- | core/src/globals.js | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/src/OCP/loader.js b/core/src/OCP/loader.js index 46087fcae19..26beaffca33 100644 --- a/core/src/OCP/loader.js +++ b/core/src/OCP/loader.js @@ -35,7 +35,7 @@ export default { * @param {string} file the script file name * @returns {Promise} */ - loadScript: function(app, file) { + loadScript(app, file) { const key = app + file if (Object.prototype.hasOwnProperty.call(loadedScripts, key)) { return Promise.resolve() @@ -59,7 +59,7 @@ export default { * @param {string} file the script file name * @returns {Promise} */ - loadStylesheet: function(app, file) { + loadStylesheet(app, file) { const key = app + file if (Object.prototype.hasOwnProperty.call(loadedStylesheets, key)) { return Promise.resolve() diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue index 46fac684370..bd0989f3950 100644 --- a/core/src/components/setup/RecommendedApps.vue +++ b/core/src/components/setup/RecommendedApps.vue @@ -135,7 +135,7 @@ export default { .map(app => limit(() => { logger.info(`installing ${app.id}`) app.loading = true - return axios.post(generateUrl(`settings/apps/enable`), { appIds: [app.id], groups: [] }) + return axios.post(generateUrl('settings/apps/enable'), { appIds: [app.id], groups: [] }) .catch(error => { logger.error(`could not install ${app.id}`, { error }) app.installationError = true diff --git a/core/src/globals.js b/core/src/globals.js index 2318182da01..08e5419f051 100644 --- a/core/src/globals.js +++ b/core/src/globals.js @@ -99,19 +99,19 @@ const setDeprecatedProp = (global, cb, msg) => { }) } -window['_'] = _ +window._ = _ 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') -window['dav'] = dav +window.dav = dav setDeprecatedProp('DOMPurify', () => DOMPurify, 'The global DOMPurify is deprecated, this will be removed in Nextcloud 21') setDeprecatedProp('Handlebars', () => Handlebars, 'please ship your own, this will be removed in Nextcloud 20') setDeprecatedProp(['jstz', 'jstimezonedetect'], () => jstimezonedetect, 'please ship your own, this will be removed in Nextcloud 20') setDeprecatedProp('md5', () => md5, 'please ship your own, this will be removed in Nextcloud 20') setDeprecatedProp('moment', () => moment, 'please ship your own, this will be removed in Nextcloud 20') -window['OC'] = OC +window.OC = OC setDeprecatedProp('initCore', () => initCore, 'this is an internal function') setDeprecatedProp('oc_appswebroots', () => OC.appswebroots, 'use OC.appswebroots instead, this will be removed in Nextcloud 20') setDeprecatedProp('oc_config', () => OC.config, 'use OC.config instead, this will be removed in Nextcloud 20') @@ -122,8 +122,8 @@ setDeprecatedProp('oc_isadmin', OC.isUserAdmin, 'use OC.isUserAdmin() instead, t setDeprecatedProp('oc_requesttoken', () => getRequestToken(), 'use OC.requestToken instead, this will be removed in Nextcloud 20') setDeprecatedProp('oc_webroot', () => OC.webroot, 'use OC.getRootPath() instead, this will be removed in Nextcloud 20') setDeprecatedProp('OCDialogs', () => OC.dialogs, 'use OC.dialogs instead, this will be removed in Nextcloud 20') -window['OCP'] = OCP -window['OCA'] = OCA +window.OCP = OCP +window.OCA = OCA $.fn.select2 = deprecate($.fn.select2, 'select2', 19) /** |