diff options
author | Jan Holesovsky <kendy@collabora.com> | 2016-04-15 18:24:30 +0300 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2016-04-15 18:24:30 +0300 |
commit | e94fa64836b5ff5621dfc1680d5af50bf59720cd (patch) | |
tree | ac2cea71768101095e8ad971dddb83d077ec670c /js | |
parent | ea47464459088859d4cebb6e04740d843f474ced (diff) |
One more place where we need to present the error message.
Diffstat (limited to 'js')
-rw-r--r-- | js/documents.js | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/js/documents.js b/js/documents.js index 63133565..bb680262 100644 --- a/js/documents.js +++ b/js/documents.js @@ -5,9 +5,7 @@ $.widget('oc.documentGrid', { context : '.documentslist', documents : {}, sessions : {}, - members : {}, - errorMessage : '', - errorHint : '' + members : {} }, _create : function (){ @@ -86,14 +84,14 @@ $.widget('oc.documentGrid', { if (!result || result.status === 'error') { documentsMain.loadError = true; if (result && result.message) { - that.options.errorMessage = result.message; + documentsMain.loadErrorMessage = result.message; } else { - that.options.errorMessage = t('richdocuments', 'Failed to load the document, please contact your administrator.'); + documentsMain.loadErrorMessage = t('richdocuments', 'Failed to load the document, please contact your administrator.'); } if (result && result.hint) { - that.options.errorHint = result.hint; + documentsMain.loadErrorHint = result.hint; } } else { @@ -121,8 +119,8 @@ $.widget('oc.documentGrid', { if (documentsMain.loadError) { $(this.options.context).after('<div id="errormessage">' - + '<p>' + this.options.errorMessage + '</p><p>' - + this.options.errorHint + + '<p>' + documentsMain.loadErrorMessage + '</p><p>' + + documentsMain.loadErrorHint + '</p></div>' ); return; @@ -182,6 +180,8 @@ var documentsMain = { baseName: null, canShare : false, loadError : false, + loadErrorMessage : '', + loadErrorHint : '', toolbar : '<div id="ocToolbar"><div id="ocToolbarInside"></div><span id="toolbar" class="claro"></span></div>', UI : { @@ -202,6 +202,11 @@ var documentsMain = { $(document.body).attr('id', 'body-user'); } + if (documentsMain.loadError) { + documentsMain.onEditorShutdown(t('richdocuments', documentsMain.loadErrorMessage + '\n' + documentsMain.loadErrorHint)); + return; + } + $(document.body).addClass("claro"); $(document.body).prepend(documentsMain.UI.container); @@ -337,7 +342,7 @@ var documentsMain = { documentsMain.show(); - if (fileId && !documentMain.loadError) { + if (fileId) { documentsMain.overlay.documentOverlay('show'); documentsMain.prepareSession(); documentsMain.joinSession(fileId); |