mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21541 from nextcloud/backport/21417/stable19 

[stable19] Fix modal support for vue apps and dark theme
This commit is contained in:
Joas Schilling 2020-06-24 13:32:57 +02:00 committed by GitHub
parent 41587bd8fb 1230916274
commit d4343de3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

6
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

2
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

4
core/src/OC/dialogs.js
View File

@ -107,7 +107,7 @@ const Dialogs = {
'none', 'none',
buttons, buttons,
callback, callback,
modal modal === undefined ? true : modal
) )
}, },
/** /**
@ -1245,7 +1245,7 @@ const Dialogs = {
dir: '', dir: '',
name: '' // Ugly but works ;) name: '' // Ugly but works ;)
}, { escapeFunction: null }).prependTo(this.$dirTree) }, { escapeFunction: null }).prependTo(this.$dirTree)
}, },
/** /**
* handle selection made in the tree list * handle selection made in the tree list

4
core/src/jquery/css/jquery.ocdialog.scss
View File

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

7
core/src/jquery/ocdialog.js vendored
View File

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