diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index ffb4fedc3..18d9edd46 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -594,15 +594,14 @@ define([ if (action) { this.setLongActionView(action) } else { + var me = this; if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) { if (this._state.fastCoauth && this._state.usersCount>1) { - var me = this; me._state.timerSave = setTimeout(function () { - appHeader.setSaveStatus('end'); - delete me._state.timerSave; + me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000); }, 500); } else - appHeader.setSaveStatus('end'); + me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000); } else this.getApplication().getController('Statusbar').setStatusCaption(''); } @@ -634,8 +633,8 @@ define([ case Asc.c_oAscAsyncAction['ForceSaveButton']: clearTimeout(this._state.timerSave); force = true; - // title = this.saveTitleText; - // text = this.saveTextText; + title = this.saveTitleText; + text = this.saveTextText; break; case Asc.c_oAscAsyncAction['LoadDocumentFonts']: @@ -717,11 +716,8 @@ define([ if (!this.isShowOpenDialog) this.loadMask.show(); - } else - if ( action.id == Asc.c_oAscAsyncAction.Save || action.id == Asc.c_oAscAsyncAction['ForceSaveButton']) { - appHeader.setSaveStatus('begin'); } else { - this.getApplication().getController('Statusbar').setStatusCaption(text); + this.getApplication().getController('Statusbar').setStatusCaption(text, force); } }, @@ -1395,9 +1391,6 @@ define([ this.updateWindowTitle(); - this.api.isDocumentModified() && - appHeader.setSaveStatus('changed'); - var toolbarView = this.getApplication().getController('Toolbar').getView(); if (toolbarView) { @@ -2092,6 +2085,7 @@ define([ errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.', titleServerVersion: 'Editor updated', errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', + textChangesSaved: 'All changes saved', errorBadImageUrl: 'Image url is incorrect', txtStyle_Normal: 'Normal', txtStyle_No_Spacing: 'No Spacing', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 51f4c9655..7a02bb0d3 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -291,7 +291,7 @@ "DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", "DE.Controllers.Main.textAnonymous": "Anonymous", "DE.Controllers.Main.textBuyNow": "Visit website", - "del_DE.Controllers.Main.textChangesSaved": "All changes saved", + "DE.Controllers.Main.textChangesSaved": "All changes saved", "DE.Controllers.Main.textCloseTip": "Click to close the tip", "DE.Controllers.Main.textContactUs": "Contact sales", "DE.Controllers.Main.textLoadingDocument": "Loading document",