Commit 7e1eab06 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Fix Bug 21104 - [CoEdit] Второе пересылаемое изображение приходит другому пользователю на оба листа

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50910 954022d7-b5bf-4e40-9824-e11837661b57
parent d554c988
......@@ -3523,6 +3523,7 @@ function DrawingObjects() {
else {
_this.asyncImageEndLoaded = function(_image) {
addImageObject(_image);
_this.asyncImageEndLoaded = null;
}
}
}
......@@ -3568,6 +3569,7 @@ function DrawingObjects() {
else {
_this.asyncImageEndLoaded = function(_image) {
addImageObject(_image);
_this.asyncImageEndLoaded = null;
}
}
}
......@@ -4412,6 +4414,7 @@ function DrawingObjects() {
else {
_this.asyncImageEndLoaded = function(_image) {
imageLoaded(_image);
_this.asyncImageEndLoaded = null;
}
}
......@@ -4462,13 +4465,12 @@ function DrawingObjects() {
var _img = api.ImageLoader.LoadImage(objectProperties.ImageUrl, 1)
if (null != _img) {
//objectProperties.ImageUrl = _img.src;
_this.controller.setGraphicObjectProps( objectProperties );
}
else {
_this.asyncImageEndLoaded = function(_image) {
//objectProperties.ImageUrl = _image.src;
_this.controller.setGraphicObjectProps( objectProperties );
_this.asyncImageEndLoaded = null;
}
}
}
......@@ -4477,13 +4479,12 @@ function DrawingObjects() {
var _img = api.ImageLoader.LoadImage(objectProperties.ShapeProperties.fill.fill.url, 1);
if ( null != _img ) {
//objectProperties.ImageUrl = _img.src;
_this.controller.setGraphicObjectProps( objectProperties );
}
else {
_this.asyncImageEndLoaded = function(_image) {
//objectProperties.ImageUrl = _image.src;
_this.controller.setGraphicObjectProps( objectProperties );
_this.asyncImageEndLoaded = null;
}
}
}
......
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