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

Move OC.dialogs to the main bundle

core/js/core.json

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

core/js/js.js

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

core/js/merged-template-prepend.json

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

core/src/OC/index.js

@@ -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,

core/src/globals.js

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