Commit 94f8eb01 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Исправлен баг с миганием картинок при открытии таблицы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53274 954022d7-b5bf-4e40-9824-e11837661b57
parent feedad60
...@@ -2565,6 +2565,7 @@ function DrawingObjects() { ...@@ -2565,6 +2565,7 @@ function DrawingObjects() {
chartRender = new ChartRender(); chartRender = new ChartRender();
var worksheet = null; var worksheet = null;
var isInit = false;
var drawingCtx = null; var drawingCtx = null;
var overlayCtx = null; var overlayCtx = null;
var shapeCtx = null; var shapeCtx = null;
...@@ -2923,6 +2924,7 @@ function DrawingObjects() { ...@@ -2923,6 +2924,7 @@ function DrawingObjects() {
aImagesSync = []; aImagesSync = [];
aObjectsSync = []; aObjectsSync = [];
isInit = false;
var theme = api.wbModel.theme; var theme = api.wbModel.theme;
for (var i = 0; currentSheet.model.Drawings && (i < currentSheet.model.Drawings.length); i++) { for (var i = 0; currentSheet.model.Drawings && (i < currentSheet.model.Drawings.length); i++) {
...@@ -3047,7 +3049,6 @@ function DrawingObjects() { ...@@ -3047,7 +3049,6 @@ function DrawingObjects() {
new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null))); new UndoRedoDataGraphicObjects(drawingObject.graphicObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
drawingObject.graphicObject.addToDrawingObjects(); drawingObject.graphicObject.addToDrawingObjects();
var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject); var boundsChecker = _this.getBoundsChecker(drawingObject.graphicObject);
aBoundsCheckers.push(boundsChecker); aBoundsCheckers.push(boundsChecker);
} }
...@@ -3087,6 +3088,7 @@ function DrawingObjects() { ...@@ -3087,6 +3088,7 @@ function DrawingObjects() {
} }
_this.shiftMap = {}; _this.shiftMap = {};
worksheet.model.Drawings = aObjects; worksheet.model.Drawings = aObjects;
isInit = true;
} }
_this.preCopy = function() { _this.preCopy = function() {
...@@ -4575,12 +4577,12 @@ function DrawingObjects() { ...@@ -4575,12 +4577,12 @@ function DrawingObjects() {
ret = aObjects.length; ret = aObjects.length;
aObjects.push(drawingObject); aObjects.push(drawingObject);
} }
drawingObject.setGraphicObjectCoords(); drawingObject.setGraphicObjectCoords();
_this.showDrawingObjects(false); if ( isInit )
_this.showDrawingObjects(false);
_this.sendGraphicObjectProps(); _this.sendGraphicObjectProps();
worksheet.model.workbook.handlers.trigger("asc_onEndAddShape"); worksheet.model.workbook.handlers.trigger("asc_onEndAddShape");
if ( lockByDefault ) { if ( lockByDefault ) {
......
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