upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

catch errors when closing file conflict dialog

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
This commit is contained in:
Robin Appelman 2020-10-28 17:40:51 +01:00 committed by npmbuildbot-nextcloud[bot]
parent 6f31880a63
commit eb59fd2baa
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
}
}
})