Merge pull request #15294 from nextcloud/refactor/oc-dialogs-bundle

Move OC.dialogs to the main bundle
This commit is contained in:
John Molakvoæ 2019-04-30 13:20:31 +02:00 committed by GitHub
commit 265a284c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 369 additions and 328 deletions

View File

@ -2,7 +2,6 @@
"libraries": [
],
"modules": [
"oc-dialogs.js",
"js.js",
"share.js",
"sharetemplates.js",

106
core/js/dist/main.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -477,12 +477,6 @@ Object.assign(window.OC, {
return path;
},
/**
* Dialog helper for jquery dialogs.
*
* @namespace OC.dialogs
*/
dialogs:OCdialogs,
/**
* Parses a URL query string into a JS map
* @param {string} queryString query string in the format param1=1234&param2=abcde&param3=xyz

View File

@ -1,5 +1,4 @@
[
"oc-dialogs.js",
"js.js",
"oc-requesttoken.js",
"mimetype.js",

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@ import Apps from './apps'
import AppConfig from './appconfig'
import Backbone from './backbone'
import ContactsMenu from './contactsmenu'
import Dialogs from './dialogs'
import EventSource from './eventsource'
import L10N from './l10n'
import msg from './msg'
@ -39,6 +40,7 @@ export default {
AppConfig,
Backbone,
ContactsMenu,
dialogs: Dialogs,
EventSource,
L10N,
msg,

View File

@ -20,7 +20,7 @@
*/
/**
*
*
* @param {Function} func the library to deprecate
* @param {String} funcName the name of the library
*/
@ -34,6 +34,18 @@ const deprecate = (func, funcName) => {
return newFunc
}
const setDeprecatedProp = (global, val, msg) =>
Object.defineProperty(window, global, {
get: () => {
if (msg) {
console.warn(`${global} is deprecated: ${msg}`)
} else {
console.warn(`${global} is deprecated`)
}
return val
}
})
import _ from 'underscore'
import $ from 'jquery'
import 'jquery-migrate/dist/jquery-migrate.min'
@ -91,6 +103,7 @@ window['md5'] = md5
window['moment'] = moment
window['OC'] = OC
setDeprecatedProp('OCDialogs', OC.dialogs, 'use OC.dialogs')
window['OCP'] = OCP
window['OCA'] = OCA
window['escapeHTML'] = deprecate(escapeHTML, 'escapeHTML')