DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Escalate fatal editor errors to user and go back to grid

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-01-21 22:23:45 +03:00
parent a46677bbe9
commit d106de7102
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/documents.js
View File

@ -186,11 +186,7 @@ var documentsMain = {
}
if (!response || !response.status || response.status==='error'){
OC.Notification.show(t('documents', 'Failed to load this document. Please check if it can be opened with an external odt editor. This might also mean it has been unshared or deleted recently.'));
documentsMain.prepareGrid();
documentsMain.show();
$(window).off('beforeunload');
setTimeout(OC.Notification.hide, 7000);
documentsMain.onEditorShutdown(t('documents', 'Failed to load this document. Please check if it can be opened with an external odt editor. This might also mean it has been unshared or deleted recently.'));
return;
}
@ -222,6 +218,7 @@ var documentsMain = {
documentsMain.webodfEditorInstance = new Editor({unstableFeaturesEnabled: documentsMain.useUnstable}, documentsMain.webodfServerInstance, serverFactory);
documentsMain.webodfEditorInstance.addEventListener(Editor.EVENT_BEFORESAVETOFILE, documentsMain.UI.showSave);
documentsMain.webodfEditorInstance.addEventListener(Editor.EVENT_SAVEDTOFILE, documentsMain.UI.hideSave);
documentsMain.webodfEditorInstance.addEventListener(Editor.EVENT_ERROR, documentsMain.onEditorShutdown);
// load the document and get called back when it's live
documentsMain.webodfEditorInstance.openSession(documentsMain.esId, documentsMain.memberId, function() {
documentsMain.webodfEditorInstance.startEditing();
@ -397,6 +394,30 @@ var documentsMain = {
input.selectRange(0, name.length);
},
onEditorShutdown : function (message){
OC.Notification.show(message);
$(window).off('beforeunload');
if (documentsMain.isEditorMode){
documentsMain.isEditorMode = false;
parent.location.hash = "";
} else {
setTimeout(OC.Notification.hide, 7000);
}
documentsMain.prepareGrid();
try {
documentsMain.webodfEditorInstance.endEditing();
documentsMain.webodfEditorInstance.closeSession(function() {
documentsMain.webodfEditorInstance.destroy(documentsMain.UI.hideEditor);
});
} catch (e){
documentsMain.UI.hideEditor();
}
documentsMain.show();
},
onClose: function() {
"use strict";