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

[DE] 'Save' status is moved to status bar

Browse source
This commit is contained in:
Maxim Kadushkin 2017-06-27 13:38:19 +03:00
parent 043594c5f4
commit b561201b95
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -594,15 +594,14 @@ define([
if (action) { if (action) {
this.setLongActionView(action) this.setLongActionView(action)
} else { } else {
var me = this;
if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) { if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
if (this._state.fastCoauth && this._state.usersCount>1) { if (this._state.fastCoauth && this._state.usersCount>1) {
var me = this;
me._state.timerSave = setTimeout(function () { me._state.timerSave = setTimeout(function () {
appHeader.setSaveStatus('end'); me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000);
delete me._state.timerSave;
}, 500); }, 500);
} else } else
appHeader.setSaveStatus('end'); me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000);
} else } else
this.getApplication().getController('Statusbar').setStatusCaption(''); this.getApplication().getController('Statusbar').setStatusCaption('');
} }
@ -634,8 +633,8 @@ define([
case Asc.c_oAscAsyncAction['ForceSaveButton']: case Asc.c_oAscAsyncAction['ForceSaveButton']:
clearTimeout(this._state.timerSave); clearTimeout(this._state.timerSave);
force = true; force = true;
// title = this.saveTitleText; title = this.saveTitleText;
// text = this.saveTextText; text = this.saveTextText;
break; break;
case Asc.c_oAscAsyncAction['LoadDocumentFonts']: case Asc.c_oAscAsyncAction['LoadDocumentFonts']:
@ -717,11 +716,8 @@ define([
if (!this.isShowOpenDialog) if (!this.isShowOpenDialog)
this.loadMask.show(); this.loadMask.show();
} else
if ( action.id == Asc.c_oAscAsyncAction.Save || action.id == Asc.c_oAscAsyncAction['ForceSaveButton']) {
appHeader.setSaveStatus('begin');
} else { } else {
this.getApplication().getController('Statusbar').setStatusCaption(text); this.getApplication().getController('Statusbar').setStatusCaption(text, force);
} }
}, },
@ -1395,9 +1391,6 @@ define([
this.updateWindowTitle(); this.updateWindowTitle();
this.api.isDocumentModified() &&
appHeader.setSaveStatus('changed');
var toolbarView = this.getApplication().getController('Toolbar').getView(); var toolbarView = this.getApplication().getController('Toolbar').getView();
if (toolbarView) { if (toolbarView) {
@ -2092,6 +2085,7 @@ define([
errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.', errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.',
titleServerVersion: 'Editor updated', titleServerVersion: 'Editor updated',
errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', 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', errorBadImageUrl: 'Image url is incorrect',
txtStyle_Normal: 'Normal', txtStyle_Normal: 'Normal',
txtStyle_No_Spacing: 'No Spacing', txtStyle_No_Spacing: 'No Spacing',

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

@ -291,7 +291,7 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", "DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.",
"DE.Controllers.Main.textAnonymous": "Anonymous", "DE.Controllers.Main.textAnonymous": "Anonymous",
"DE.Controllers.Main.textBuyNow": "Visit website", "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.textCloseTip": "Click to close the tip",
"DE.Controllers.Main.textContactUs": "Contact sales", "DE.Controllers.Main.textContactUs": "Contact sales",
"DE.Controllers.Main.textLoadingDocument": "Loading document", "DE.Controllers.Main.textLoadingDocument": "Loading document",