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

Merge pull request #23774 from nextcloud/backport/23762/stable20

Browse source 
[stable20] catch errors when closing file conflict dialog
This commit is contained in:
Roeland Jago Douma 2020-10-29 10:30:42 +01:00 committed by GitHub
commit fcd7bcfe2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 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

2
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

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

@ -930,7 +930,11 @@ const Dialogs = {
closeButton: null,
close: function() {
self._fileexistsshown = false
$(this).ocdialog('destroy').remove()
try {
$(this).ocdialog('destroy').remove()
} catch (e) {
// ignore
}
}
})