Commit 90b1ba27 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

На view режиме не отправляем стили

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48275 954022d7-b5bf-4e40-9824-e11837661b57
parent cdc9d701
...@@ -580,6 +580,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -580,6 +580,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
this.isUseEmbeddedCutFonts = false; this.isUseEmbeddedCutFonts = false;
// Отправка стилей
this._sendWorkbookStyles();
} }
} }
}, },
...@@ -1438,6 +1441,19 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1438,6 +1441,19 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
}, },
_sendWorkbookStyles: function () {
// Отправка стилей форматированных таблиц
var autoFilters = new asc.AutoFilters();
var tablePictures = autoFilters.getTablePictures(this.wbModel);
var bResult = this.handlers.trigger("asc_onInitTablePictures", tablePictures);
this.tablePictures = (false === bResult) ? tablePictures : null;
// Отправка стилей ячеек
var guiStyles = this.wb.getCellStyles();
bResult = this.handlers.trigger("asc_onInitEditorStyles", guiStyles);
this.guiStyles = (false === bResult) ? guiStyles : null;
},
startCollaborationEditing: function () { startCollaborationEditing: function () {
// Начинаем совместное редактирование // Начинаем совместное редактирование
this.collaborativeEditing.startCollaborationEditing(); this.collaborativeEditing.startCollaborationEditing();
...@@ -2500,15 +2516,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2500,15 +2516,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.chartStyleManager.init(); this.chartStyleManager.init();
this.chartPreviewManager.init(); this.chartPreviewManager.init();
var autoFilters = new asc.AutoFilters(); // На view-режиме не нужно отправлять стили
var tablePictures = autoFilters.getTablePictures(this.wbModel); if (this.controller.getViewerMode && true !== this.controller.getViewerMode()) {
var bResult = this.handlers.trigger("asc_onInitTablePictures", tablePictures); // Отправка стилей
this.tablePictures = (false === bResult) ? tablePictures : null; this._sendWorkbookStyles();
}
// Отправка стилей ячеек
var guiStyles = this.wb.getCellStyles();
bResult = this.handlers.trigger("asc_onInitEditorStyles", guiStyles);
this.guiStyles = (false === bResult) ? guiStyles : null;
if (bRedraw) { if (bRedraw) {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
......
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