upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #21630 from nextcloud/fix/21627/close-x

Browse source 
Make closing dialogs callback with false
This commit is contained in:
Roeland Jago Douma 2020-06-30 19:38:37 +02:00 committed by GitHub
commit aca0046aec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 5 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

4
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

1
core/src/OC/dialogs.js
View file

@ -625,6 +625,7 @@ const Dialogs = {
$(dialogId).ocdialog({
closeOnEscape: true,
closeCallback: () => { callback && callback(false) },
modal: modal,
buttons: buttonlist
})

2
core/src/jquery/ocdialog.js vendored
View file

@ -27,6 +27,7 @@ $.widget('oc.ocdialog', {
height: 'auto',
closeButton: true,
closeOnEscape: true,
closeCallback: null,
modal: false,
},
_create: function() {
@ -169,6 +170,7 @@ $.widget('oc.ocdialog', {
const $closeButton = $('<a class="oc-dialog-close"></a>')
this.$dialog.prepend($closeButton)
$closeButton.on('click', function() {
self.options.closeCallback && self.options.closeCallback()
self.close()
})
} else {