Commit eca88479 authored by Alexander Trofimov's avatar Alexander Trofimov Committed by GitHub

Merge pull request #24 from ONLYOFFICE/release/3.8.1

Release/3.8.1
parents 91f8a005 2f147148
...@@ -3163,12 +3163,12 @@ var editor; ...@@ -3163,12 +3163,12 @@ var editor;
if (1 == _param) { if (1 == _param) {
_adjustPrint.asc_setPrintType(Asc.c_oAscPrintType.EntireWorkbook); _adjustPrint.asc_setPrintType(Asc.c_oAscPrintType.EntireWorkbook);
var printOptions; var pageSetup;
var countWorksheets = this.wbModel.getWorksheetCount(); var countWorksheets = this.wbModel.getWorksheetCount();
for (var j = 0; j < countWorksheets; ++j) { for (var j = 0; j < countWorksheets; ++j) {
printOptions = this.wbModel.getWorksheet(j).PagePrintOptions; pageSetup = this.wbModel.getWorksheet(j).PagePrintOptions.asc_getPageSetup();
printOptions.asc_setFitToWidth(true); pageSetup.asc_setFitToWidth(true);
printOptions.asc_setFitToHeight(true); pageSetup.asc_setFitToHeight(true);
} }
} }
......
...@@ -281,7 +281,9 @@ ...@@ -281,7 +281,9 @@
}; };
baseEditorsApi.prototype.sync_InitEditorFonts = function(gui_fonts) baseEditorsApi.prototype.sync_InitEditorFonts = function(gui_fonts)
{ {
this.sendEvent("asc_onInitEditorFonts", gui_fonts); if (!this.isViewMode) {
this.sendEvent("asc_onInitEditorFonts", gui_fonts);
}
}; };
baseEditorsApi.prototype.sync_StartAction = function(type, id) baseEditorsApi.prototype.sync_StartAction = function(type, id)
{ {
......
...@@ -2355,11 +2355,15 @@ background-repeat: no-repeat;\ ...@@ -2355,11 +2355,15 @@ background-repeat: no-repeat;\
{ {
this._gui_editor_themes = gui_editor_themes; this._gui_editor_themes = gui_editor_themes;
this._gui_document_themes = gui_document_themes; this._gui_document_themes = gui_document_themes;
this.asc_fireCallback("asc_onInitEditorStyles", [gui_editor_themes, gui_document_themes]); if (!this.isViewMode) {
this.asc_fireCallback("asc_onInitEditorStyles", [gui_editor_themes, gui_document_themes]);
}
}; };
asc_docs_api.prototype.sync_InitEditorTableStyles = function(styles) asc_docs_api.prototype.sync_InitEditorTableStyles = function(styles)
{ {
this.asc_fireCallback("asc_onInitTableTemplates", styles); if (!this.isViewMode) {
this.asc_fireCallback("asc_onInitTableTemplates", styles);
}
}; };
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
......
...@@ -2954,11 +2954,15 @@ background-repeat: no-repeat;\ ...@@ -2954,11 +2954,15 @@ background-repeat: no-repeat;\
}; };
asc_docs_api.prototype.sync_InitEditorStyles = function(styles_painter) asc_docs_api.prototype.sync_InitEditorStyles = function(styles_painter)
{ {
this.asc_fireCallback("asc_onInitEditorStyles", styles_painter); if (!this.isViewMode) {
this.asc_fireCallback("asc_onInitEditorStyles", styles_painter);
}
}; };
asc_docs_api.prototype.sync_InitEditorTableStyles = function(styles, is_retina_enabled) asc_docs_api.prototype.sync_InitEditorTableStyles = function(styles, is_retina_enabled)
{ {
this.asc_fireCallback("asc_onInitTableTemplates", styles, is_retina_enabled); if (!this.isViewMode) {
this.asc_fireCallback("asc_onInitTableTemplates", styles, is_retina_enabled);
}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment