Skip to content

Fix modal support for vue apps #21417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 5 commits into from
Jun 17, 2020
Merged

Fix modal support for vue apps #21417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1f74b0
Fix modal support for vue apps
nickvergessen Jun 15, 2020
be0ecbc
Make the confirm dialog modal by default
nickvergessen Jun 15, 2020
b514030
Add darkmode support for the modal background
nickvergessen Jun 15, 2020
2d96e89
Rebuild JS files
nickvergessen Jun 15, 2020
eca3c9f
Darker background for dark mode
nickvergessen Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/js/dist/login.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/login.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions core/js/dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/src/OC/dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const Dialogs = {
'none',
buttons,
callback,
modal
modal === undefined ? true : modal
)
},
/**
Expand Down Expand Up @@ -1245,7 +1245,7 @@ const Dialogs = {
dir: '',
name: '' // Ugly but works ;)
}, { escapeFunction: null }).prependTo(this.$dirTree)

},
/**
* handle selection made in the tree list
Expand Down
4 changes: 4 additions & 0 deletions core/src/jquery/css/jquery.ocdialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@
height: 100%;
}

body.dark .oc-dialog-dim {
opacity: .8;
}

.oc-dialog-content {
width: 100%;
max-width: 550px;
Expand Down
7 changes: 6 additions & 1 deletion core/src/jquery/ocdialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down