Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enable/disable downloading and printing for different disconnections. Add Asc.c_oAscError.ID.EditingError error.

Browse source
This commit is contained in:
Julia Radzhabova 2018-10-25 16:19:29 +03:00
parent 79a59b4838
commit c62858944f
21 changed files with 87 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -143,7 +143,7 @@ define([
setApi: function(api) { setApi: function(api) {
this.api = api; this.api = api;
this.api.asc_registerCallback('asc_onReplaceAll', _.bind(this.onApiTextReplaced, this)); this.api.asc_registerCallback('asc_onReplaceAll', _.bind(this.onApiTextReplaced, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
/** coauthoring begin **/ /** coauthoring begin **/
@ -564,7 +564,7 @@ define([
} }
}, },
onApiServerDisconnect: function(disableDownload) { onApiServerDisconnect: function(enableDownload) {
this.mode.isEdit = false; this.mode.isEdit = false;
this.leftMenu.close(); this.leftMenu.close();
@ -575,7 +575,7 @@ define([
this.leftMenu.btnPlugins.setDisabled(true); this.leftMenu.btnPlugins.setDisabled(true);
this.leftMenu.btnNavigation.setDisabled(true); this.leftMenu.btnNavigation.setDisabled(true);
this.leftMenu.getMenu('file').setMode({isDisconnected: true, disableDownload: !!disableDownload}); this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
if ( this.dlgSearch ) { if ( this.dlgSearch ) {
this.leftMenu.btnSearch.toggle(false, true); this.leftMenu.btnSearch.toggle(false, true);
this.dlgSearch['hide'](); this.dlgSearch['hide']();

17
apps/documenteditor/main/app/controller/Main.js
View file

@ -949,7 +949,7 @@ define([
} }
if (me.needToUpdateVersion) if (me.needToUpdateVersion)
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect', true);
var timer_sl = setInterval(function(){ var timer_sl = setInterval(function(){
if (window.styles_loaded) { if (window.styles_loaded) {
clearInterval(timer_sl); clearInterval(timer_sl);
@ -968,7 +968,7 @@ define([
me.updateThemeColors(); me.updateThemeColors();
toolbarController.activateControls(); toolbarController.activateControls();
if (me.needToUpdateVersion) if (me.needToUpdateVersion)
toolbarController.onApiCoAuthoringDisconnect(); toolbarController.onApiCoAuthoringDisconnect(true);
me.api.UpdateInterfaceState(); me.api.UpdateInterfaceState();
me.fillTextArt(me.api.asc_getTextArtPreviews()); me.fillTextArt(me.api.asc_getTextArtPreviews());
@ -1020,7 +1020,7 @@ define([
} }
this.disableEditing(true); this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect', true);
var value = Common.localStorage.getItem("de-license-warning"); var value = Common.localStorage.getItem("de-license-warning");
value = (value!==null) ? parseInt(value) : 0; value = (value!==null) ? parseInt(value) : 0;
@ -1429,6 +1429,10 @@ define([
config.msg = this.errorDataEncrypted; config.msg = this.errorDataEncrypted;
break; break;
case Asc.c_oAscError.ID.EditingError:
config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1482,6 +1486,9 @@ define([
} }
})).show(); })).show();
},10); },10);
} else if (id == Asc.c_oAscError.ID.EditingError) {
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print
} }
this._state.lostEditingRights = false; this._state.lostEditingRights = false;
this.onEditComplete(); this.onEditComplete();
@ -2301,7 +2308,9 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.', errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close', textClose: 'Close',
textPaidFeature: 'Paid feature', textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department' textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department',
errorEditingSaveas: 'An error occurred during the work with the document.<br>Use the \'Save as...\' option to save the file backup copy to your computer hard drive.',
errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
} }
})(), DE.Controllers.Main || {})) })(), DE.Controllers.Main || {}))
}); });

6
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -358,7 +358,7 @@ define([
this.api.asc_registerCallback('asc_onMarkerFormatChanged', _.bind(this.onApiStartHighlight, this)); this.api.asc_registerCallback('asc_onMarkerFormatChanged', _.bind(this.onApiStartHighlight, this));
this.api.asc_registerCallback('asc_onTextHighLight', _.bind(this.onApiHighlightColor, this)); this.api.asc_registerCallback('asc_onTextHighLight', _.bind(this.onApiHighlightColor, this));
this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this)); this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this));
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this)); this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this));
@ -2674,8 +2674,8 @@ define([
}); });
}, },
onApiCoAuthoringDisconnect: function(disableDownload) { onApiCoAuthoringDisconnect: function(enableDownload) {
this.toolbar.setMode({isDisconnected:true, disableDownload: !!disableDownload}); this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
this.editMode = false; this.editMode = false;
this.DisableToolbar(true, true); this.DisableToolbar(true, true);
}, },

6
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -381,11 +381,11 @@ define([
} }
}, },
onApiCoAuthoringDisconnect: function() { onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) { if (this.header) {
if (this.header.btnDownload) if (this.header.btnDownload && !enableDownload)
this.header.btnDownload.hide(); this.header.btnDownload.hide();
if (this.header.btnPrint) if (this.header.btnPrint && !enableDownload)
this.header.btnPrint.hide(); this.header.btnPrint.hide();
if (this.header.btnEdit) if (this.header.btnEdit)
this.header.btnEdit.hide(); this.header.btnEdit.hide();

4
apps/documenteditor/main/app/view/FileMenu.js
View file

@ -322,8 +322,8 @@ define([
this.mode.canOpenRecent = this.mode.canCreateNew = false; this.mode.canOpenRecent = this.mode.canCreateNew = false;
this.mode.isDisconnected = mode.isDisconnected; this.mode.isDisconnected = mode.isDisconnected;
this.mode.canRename = false; this.mode.canRename = false;
this.mode.canPrint = false; if (!mode.enableDownload)
this.mode.canDownload = this.mode.canDownloadOrigin = false; this.mode.canPrint = this.mode.canDownload = this.mode.canDownloadOrigin = false;
} else { } else {
this.mode = mode; this.mode = mode;
} }

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -2003,7 +2003,7 @@ define([
setMode: function (mode) { setMode: function (mode) {
if (mode.isDisconnected) { if (mode.isDisconnected) {
this.btnSave.setDisabled(true); this.btnSave.setDisabled(true);
if (mode.disableDownload) if (!mode.enableDownload)
this.btnPrint.setDisabled(true); this.btnPrint.setDisabled(true);
} }

2
apps/documenteditor/main/locale/en.json
View file

@ -359,6 +359,8 @@
"DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
"DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
"DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
"DE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
"DE.Controllers.Main.loadFontsTextText": "Loading data...", "DE.Controllers.Main.loadFontsTextText": "Loading data...",
"DE.Controllers.Main.loadFontsTitleText": "Loading Data", "DE.Controllers.Main.loadFontsTitleText": "Loading Data",

6
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -133,7 +133,7 @@ define([
setApi: function(api) { setApi: function(api) {
this.api = api; this.api = api;
this.api.asc_registerCallback('asc_onThumbnailsShow', _.bind(this.onThumbnailsShow, this)); this.api.asc_registerCallback('asc_onThumbnailsShow', _.bind(this.onThumbnailsShow, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
/** coauthoring begin **/ /** coauthoring begin **/
@ -422,7 +422,7 @@ define([
// this.api.asc_selectSearchingResults(false); // this.api.asc_selectSearchingResults(false);
}, },
onApiServerDisconnect: function(disableDownload) { onApiServerDisconnect: function(enableDownload) {
this.mode.isEdit = false; this.mode.isEdit = false;
this.leftMenu.close(); this.leftMenu.close();
@ -432,7 +432,7 @@ define([
/** coauthoring end **/ /** coauthoring end **/
this.leftMenu.btnPlugins.setDisabled(true); this.leftMenu.btnPlugins.setDisabled(true);
this.leftMenu.getMenu('file').setMode({isDisconnected: true, disableDownload: !!disableDownload}); this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
if ( this.dlgSearch ) { if ( this.dlgSearch ) {
this.leftMenu.btnSearch.toggle(false, true); this.leftMenu.btnSearch.toggle(false, true);
this.dlgSearch['hide'](); this.dlgSearch['hide']();

17
apps/presentationeditor/main/app/controller/Main.js
View file

@ -712,7 +712,7 @@ define([
} }
if (me.needToUpdateVersion) if (me.needToUpdateVersion)
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect', true);
var timer_sl = setInterval(function(){ var timer_sl = setInterval(function(){
if (window.styles_loaded) { if (window.styles_loaded) {
clearInterval(timer_sl); clearInterval(timer_sl);
@ -734,7 +734,7 @@ define([
me.fillTextArt(me.api.asc_getTextArtPreviews()); me.fillTextArt(me.api.asc_getTextArtPreviews());
toolbarController.activateControls(); toolbarController.activateControls();
if (me.needToUpdateVersion) if (me.needToUpdateVersion)
toolbarController.onApiCoAuthoringDisconnect(); toolbarController.onApiCoAuthoringDisconnect(true);
me.api.UpdateInterfaceState(); me.api.UpdateInterfaceState();
Common.NotificationCenter.trigger('document:ready', 'main'); Common.NotificationCenter.trigger('document:ready', 'main');
@ -784,7 +784,7 @@ define([
} }
this.disableEditing(true); this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect', true);
var value = Common.localStorage.getItem("pe-license-warning"); var value = Common.localStorage.getItem("pe-license-warning");
value = (value!==null) ? parseInt(value) : 0; value = (value!==null) ? parseInt(value) : 0;
@ -1164,6 +1164,10 @@ define([
config.msg = this.errorDataEncrypted; config.msg = this.errorDataEncrypted;
break; break;
case Asc.c_oAscError.ID.EditingError:
config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1216,6 +1220,9 @@ define([
} }
})).show(); })).show();
},10); },10);
} else if (id == Asc.c_oAscError.ID.EditingError) {
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print
} }
this._state.lostEditingRights = false; this._state.lostEditingRights = false;
this.onEditComplete(); this.onEditComplete();
@ -2071,7 +2078,9 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.', errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close', textClose: 'Close',
textPaidFeature: 'Paid feature', textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department' textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department',
errorEditingSaveas: 'An error occurred during the work with the document.<br>Use the \'Save as...\' option to save the file backup copy to your computer hard drive.',
errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
} }
})(), PE.Controllers.Main || {})) })(), PE.Controllers.Main || {}))
}); });

6
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -339,7 +339,7 @@ define([
this.api.asc_registerCallback('asc_onCanUnGroup', _.bind(this.onApiCanUnGroup, this)); this.api.asc_registerCallback('asc_onCanUnGroup', _.bind(this.onApiCanUnGroup, this));
this.api.asc_registerCallback('asc_onPresentationSize', _.bind(this.onApiPageSize, this)); this.api.asc_registerCallback('asc_onPresentationSize', _.bind(this.onApiPageSize, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onZoomChange', _.bind(this.onApiZoomChange, this)); this.api.asc_registerCallback('asc_onZoomChange', _.bind(this.onApiZoomChange, this));
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this));
@ -770,8 +770,8 @@ define([
this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]}); this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
}, },
onApiCoAuthoringDisconnect: function(disableDownload) { onApiCoAuthoringDisconnect: function(enableDownload) {
this.toolbar.setMode({isDisconnected:true, disableDownload: !!disableDownload}); this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
this.editMode = false; this.editMode = false;
}, },

6
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -423,11 +423,11 @@ define([
} }
}, },
onApiCoAuthoringDisconnect: function() { onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) { if (this.header) {
if (this.header.btnDownload) if (this.header.btnDownload && !enableDownload)
this.header.btnDownload.hide(); this.header.btnDownload.hide();
if (this.header.btnPrint) if (this.header.btnPrint && !enableDownload)
this.header.btnPrint.hide(); this.header.btnPrint.hide();
if (this.header.btnEdit) if (this.header.btnEdit)
this.header.btnEdit.hide(); this.header.btnEdit.hide();

4
apps/presentationeditor/main/app/view/FileMenu.js
View file

@ -310,8 +310,8 @@ define([
this.mode.canOpenRecent = this.mode.canCreateNew = false; this.mode.canOpenRecent = this.mode.canCreateNew = false;
this.mode.isDisconnected = mode.isDisconnected; this.mode.isDisconnected = mode.isDisconnected;
this.mode.canRename = false; this.mode.canRename = false;
this.mode.canPrint = false; if (!mode.enableDownload)
this.mode.canDownload = false; this.mode.canPrint = this.mode.canDownload = false;
} else { } else {
this.mode = mode; this.mode = mode;
} }

8
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1316,7 +1316,11 @@ define([
setMode: function (mode) { setMode: function (mode) {
if (mode.isDisconnected) { if (mode.isDisconnected) {
this.lockToolbar(PE.enumLock.lostConnect, true); this.lockToolbar(PE.enumLock.lostConnect, true);
} if (!mode.enableDownload)
this.lockToolbar(PE.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else
this.lockToolbar(PE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
this.mode = mode; this.mode = mode;
if (!mode.nativeApp) { if (!mode.nativeApp) {
var nativeBtnGroup = $('.toolbar-group-native'); var nativeBtnGroup = $('.toolbar-group-native');
@ -1328,8 +1332,6 @@ define([
if (mode.isDesktopApp) if (mode.isDesktopApp)
$('.toolbar-group-native').hide(); $('.toolbar-group-native').hide();
this.lockToolbar(PE.enumLock.cantPrint, !mode.canPrint || mode.disableDownload, {array: [this.btnPrint]});
}, },
onSendThemeColorSchemes: function (schemas) { onSendThemeColorSchemes: function (schemas) {

2
apps/presentationeditor/main/locale/en.json
View file

@ -271,6 +271,8 @@
"PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
"PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
"PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.", "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
"PE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
"PE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"PE.Controllers.Main.leavePageText": "You have unsaved changes in this presentation. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.", "PE.Controllers.Main.leavePageText": "You have unsaved changes in this presentation. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
"PE.Controllers.Main.loadFontsTextText": "Loading data...", "PE.Controllers.Main.loadFontsTextText": "Loading data...",
"PE.Controllers.Main.loadFontsTitleText": "Loading Data", "PE.Controllers.Main.loadFontsTitleText": "Loading Data",

6
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -141,7 +141,7 @@ define([
setApi: function(api) { setApi: function(api) {
this.api = api; this.api = api;
this.api.asc_registerCallback('asc_onRenameCellTextEnd', _.bind(this.onRenameText, this)); this.api.asc_registerCallback('asc_onRenameCellTextEnd', _.bind(this.onRenameText, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
/** coauthoring begin **/ /** coauthoring begin **/
@ -621,7 +621,7 @@ define([
} }
}, },
onApiServerDisconnect: function(disableDownload) { onApiServerDisconnect: function(enableDownload) {
this.mode.isEdit = false; this.mode.isEdit = false;
this.leftMenu.close(); this.leftMenu.close();
@ -631,7 +631,7 @@ define([
/** coauthoring end **/ /** coauthoring end **/
this.leftMenu.btnPlugins.setDisabled(true); this.leftMenu.btnPlugins.setDisabled(true);
this.leftMenu.getMenu('file').setMode({isDisconnected: true, disableDownload: !!disableDownload}); this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
if ( this.dlgSearch ) { if ( this.dlgSearch ) {
this.leftMenu.btnSearch.toggle(false, true); this.leftMenu.btnSearch.toggle(false, true);
this.dlgSearch['hide'](); this.dlgSearch['hide']();

19
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -710,8 +710,8 @@ define([
} }
if (me.needToUpdateVersion) { if (me.needToUpdateVersion) {
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect', true);
toolbarController.onApiCoAuthoringDisconnect(); toolbarController.onApiCoAuthoringDisconnect(true);
} }
var timer_sl = setInterval(function(){ var timer_sl = setInterval(function(){
@ -746,7 +746,7 @@ define([
formulasDlgController.setMode(me.appOptions).setApi(me.api); formulasDlgController.setMode(me.appOptions).setApi(me.api);
} }
if (me.needToUpdateVersion) if (me.needToUpdateVersion)
toolbarController.onApiCoAuthoringDisconnect(); toolbarController.onApiCoAuthoringDisconnect(true);
Common.NotificationCenter.trigger('document:ready', 'main'); Common.NotificationCenter.trigger('document:ready', 'main');
me.applyLicense(); me.applyLicense();
@ -811,7 +811,7 @@ define([
} }
this.disableEditing(true); this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect', true);
var value = Common.localStorage.getItem("sse-license-warning"); var value = Common.localStorage.getItem("sse-license-warning");
value = (value!==null) ? parseInt(value) : 0; value = (value!==null) ? parseInt(value) : 0;
@ -1326,6 +1326,10 @@ define([
config.msg = this.errorDataEncrypted; config.msg = this.errorDataEncrypted;
break; break;
case Asc.c_oAscError.ID.EditingError:
config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1361,6 +1365,9 @@ define([
if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
(this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas'); (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas');
} else if (id == Asc.c_oAscError.ID.EditingError) {
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print
} }
this._state.lostEditingRights = false; this._state.lostEditingRights = false;
this.onEditComplete(); this.onEditComplete();
@ -2251,7 +2258,9 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.', errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close', textClose: 'Close',
textPaidFeature: 'Paid feature', textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department' textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department',
errorEditingSaveas: 'An error occurred during the work with the document.<br>Use the \'Save as...\' option to save the file backup copy to your computer hard drive.',
errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -381,7 +381,7 @@ define([
} }
this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this)); this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this));
this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this)); this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this));
@ -1627,8 +1627,8 @@ define([
window.styles_loaded = true; window.styles_loaded = true;
}, },
onApiCoAuthoringDisconnect: function(disableDownload) { onApiCoAuthoringDisconnect: function(enableDownload) {
this.toolbar.setMode({isDisconnected:true, disableDownload: !!disableDownload}); this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
this.editMode = false; this.editMode = false;
}, },

6
apps/spreadsheeteditor/main/app/controller/Viewport.js
View file

@ -437,11 +437,11 @@ define([
} }
}, },
onApiCoAuthoringDisconnect: function() { onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) { if (this.header) {
if (this.header.btnDownload) if (this.header.btnDownload && !enableDownload)
this.header.btnDownload.hide(); this.header.btnDownload.hide();
if (this.header.btnPrint) if (this.header.btnPrint && !enableDownload)
this.header.btnPrint.hide(); this.header.btnPrint.hide();
if (this.header.btnEdit) if (this.header.btnEdit)
this.header.btnEdit.hide(); this.header.btnEdit.hide();

4
apps/spreadsheeteditor/main/app/view/FileMenu.js
View file

@ -298,8 +298,8 @@ define([
this.mode.canOpenRecent = this.mode.canCreateNew = false; this.mode.canOpenRecent = this.mode.canCreateNew = false;
this.mode.isDisconnected = mode.isDisconnected; this.mode.isDisconnected = mode.isDisconnected;
this.mode.canRename = false; this.mode.canRename = false;
this.mode.canPrint = false; if (!mode.enableDownload)
this.mode.canDownload = false; this.mode.canPrint = this.mode.canDownload = false;
} else { } else {
this.mode = mode; this.mode = mode;
} }

3
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -2007,7 +2007,8 @@ define([
this.lockToolbar( SSE.enumLock.lostConnect, true ); this.lockToolbar( SSE.enumLock.lostConnect, true );
this.lockToolbar( SSE.enumLock.lostConnect, true, this.lockToolbar( SSE.enumLock.lostConnect, true,
{array:[this.btnEditChart,this.btnUndo,this.btnRedo]} ); {array:[this.btnEditChart,this.btnUndo,this.btnRedo]} );
this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint || mode.disableDownload, {array: [this.btnPrint]}); if (!mode.enableDownload)
this.lockToolbar(SSE.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else { } else {
this.mode = mode; this.mode = mode;
this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]}); this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -445,6 +445,8 @@
"SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.", "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
"SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.<br>Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.<br>Wrong number of brackets is used.",
"SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.<br>Please correct the error.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.<br>Please correct the error.",
"SSE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
"SSE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.",
"SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTextText": "Loading data...",
"SSE.Controllers.Main.loadFontsTitleText": "Loading Data", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data",