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

Merge branch 'develop' into feature/sse-header-footer

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-21 14:00:16 +03:00
parent f846d91706 a10f12fb49
commit 21e2fbe0cf
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1493,7 +1493,7 @@ define([
onBeforeUnload: function() { onBeforeUnload: function() {
Common.localStorage.save(); Common.localStorage.save();
var isEdit = this.permissions.edit !== false && this.editorConfig.mode !== 'view' && this.editorConfig.mode !== 'editdiagram'; var isEdit = this.permissions.edit !== false && this.editorConfig.mode !== 'view' && this.editorConfig.mode !== 'editdiagram' && this.editorConfig.mode !== 'editmerge';
if (isEdit && this.api.asc_isDocumentModified()) { if (isEdit && this.api.asc_isDocumentModified()) {
var me = this; var me = this;
this.api.asc_stopSaving(); this.api.asc_stopSaving();

5
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -136,7 +136,7 @@ define([
if (item) if (item)
panel.cmbPaperSize.setValue(item.get('value')); panel.cmbPaperSize.setValue(item.get('value'));
else else
panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h + ')'); panel.cmbPaperSize.setValue(this.txtCustom + ' (' + w +' x ' + h + ')');
var fitwidth = opt.asc_getFitToWidth(), var fitwidth = opt.asc_getFitToWidth(),
fitheight = opt.asc_getFitToHeight(); fitheight = opt.asc_getFitToHeight();
@ -346,6 +346,7 @@ define([
warnCheckMargings: 'Margins are incorrect', warnCheckMargings: 'Margins are incorrect',
strAllSheets: 'All Sheets', strAllSheets: 'All Sheets',
textWarning: 'Warning' textWarning: 'Warning',
txtCustom: 'Custom'
}, SSE.Controllers.Print || {})); }, SSE.Controllers.Print || {}));
}); });

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

@ -546,6 +546,7 @@
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.textWarning": "Warning",
"SSE.Controllers.Print.txtCustom": "Custom",
"SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect", "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",
"SSE.Controllers.Statusbar.errorLastSheet": "Workbook must have at least one visible worksheet.", "SSE.Controllers.Statusbar.errorLastSheet": "Workbook must have at least one visible worksheet.",
"SSE.Controllers.Statusbar.errorRemoveSheet": "Cannot delete the worksheet.", "SSE.Controllers.Statusbar.errorRemoveSheet": "Cannot delete the worksheet.",