Merge pull request #21543 from nextcloud/backport/21417/stable18

[stable18] Fix modal support for vue apps and dark theme

Author: nickvergessen

core/js/dist/login.js

@@ -108,7 +108,7 @@ const Dialogs = {
 			'none',
 			buttons,
 			callback,
-			modal
+			modal === undefined ? true : modal
 		)
 	},
 	/**

core/js/dist/login.js.map

@@ -72,6 +72,10 @@
 	height: 100%;
 }
 
+body.dark .oc-dialog-dim {
+	opacity: .8;
+}
+
 .oc-dialog-content {
 	width: 100%;
 	max-width: 550px;

core/js/dist/main.js

@@ -210,9 +210,14 @@ $.widget('oc.ocdialog', {
 		}
 
 		const self = this
+		let contentDiv = $('#content')
+		if (contentDiv.length === 0) {
+			// nextcloud-vue compatibility
+			contentDiv = $('.content')
+		}
 		this.overlay = $('<div>')
 			.addClass('oc-dialog-dim')
-			.appendTo($('#content'))
+			.appendTo(contentDiv)
 		this.overlay.on('click keydown keyup', function(event) {
 			if (event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
 				event.preventDefault()