Commit 4f7cb983 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47951 954022d7-b5bf-4e40-9824-e11837661b57
parent acb659a0
...@@ -2075,7 +2075,7 @@ function DrawingObjects() { ...@@ -2075,7 +2075,7 @@ function DrawingObjects() {
var documentId = null; var documentId = null;
var lastObjectIndex = null; var lastObjectIndex = null;
//var imageLoader = new ImageLoader(); var imageLoader = new ImageLoader();
_this.drawingDocument = null; _this.drawingDocument = null;
_this.asyncImageLoadedEvent = null; _this.asyncImageLoadedEvent = null;
...@@ -2475,14 +2475,14 @@ function DrawingObjects() { ...@@ -2475,14 +2475,14 @@ function DrawingObjects() {
_this.clearDrawingObjects(); _this.clearDrawingObjects();
} }
/*if ( !imageLoader.isReady() ) { if ( !imageLoader.isReady() ) {
//console.log("imageLoader - False"); //console.log("imageLoader - False");
imageLoader.setReadyCallback(_this.showDrawingObjects); imageLoader.setReadyCallback(_this.showDrawingObjects);
} }
else { else {
//console.log("imageLoader - Ok"); //console.log("imageLoader - Ok");
imageLoader.removeReadyCallback(); imageLoader.removeReadyCallback();
}*/ }
for (var i = 0; i < _this.countDrawingObjects(); i++) { for (var i = 0; i < _this.countDrawingObjects(); i++) {
...@@ -2540,8 +2540,8 @@ function DrawingObjects() { ...@@ -2540,8 +2540,8 @@ function DrawingObjects() {
if ( !chartBase64 ) if ( !chartBase64 )
continue; continue;
//imageLoader.addImage(chartBase64); imageLoader.addImage(chartBase64);
//imageLoader.setReadyCallback(_this.showDrawingObjects); imageLoader.setReadyCallback(_this.showDrawingObjects);
obj.image.onload = function() { obj.image.onload = function() {
obj.flags.currentCursor = null; obj.flags.currentCursor = null;
...@@ -3459,7 +3459,7 @@ function DrawingObjects() { ...@@ -3459,7 +3459,7 @@ function DrawingObjects() {
if ( !chartBase64 ) if ( !chartBase64 )
return false; return false;
//imageLoader.addImage(chartBase64); imageLoader.addImage(chartBase64);
// draw // draw
var obj = _this.createDrawingObject(); var obj = _this.createDrawingObject();
......
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