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

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

[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
parent 62f81da02e eb59fd2baa
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

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

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