Commit a0b22ada authored by Oleg Korshul's avatar Oleg Korshul

загрузка текстурных заливок в десктопе

parent 54a49f11
...@@ -2458,6 +2458,16 @@ var editor; ...@@ -2458,6 +2458,16 @@ var editor;
} }
} }
if(fReplaceCallback){ if(fReplaceCallback){
if (window["AscDesktopEditor"])
{
var firstUrl = window["AscDesktopEditor"]["LocalFileGetImageUrl"](sImageUrl);
firstUrl = g_oDocumentUrls.getImageUrl(firstUrl);
fReplaceCallback(firstUrl);
ws.objectRender.setGraphicObjectProps(props);
return;
}
var rData = { var rData = {
"id": this.documentId, "id": this.documentId,
"userid": this.documentUserId, "userid": this.documentUserId,
......
...@@ -1810,6 +1810,15 @@ asc_docs_api.prototype.ShapeApply = function(prop) ...@@ -1810,6 +1810,15 @@ asc_docs_api.prototype.ShapeApply = function(prop)
fApplyCallback(); fApplyCallback();
} }
else{ else{
if (window["AscDesktopEditor"])
{
image_url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](sImageUrl);
image_url = g_oDocumentUrls.getImageUrl(image_url);
fApplyCallback();
return;
}
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
this.fCurCallback = function(input) { this.fCurCallback = function(input) {
if(null != input && "imgurl" == input["type"]){ if(null != input && "imgurl" == input["type"]){
......
...@@ -4873,6 +4873,16 @@ asc_docs_api.prototype.ImgApply = function(obj) ...@@ -4873,6 +4873,16 @@ asc_docs_api.prototype.ImgApply = function(obj)
}; };
if(sImageUrl){ if(sImageUrl){
if (window["AscDesktopEditor"])
{
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](sImageToDownLoad);
_url = g_oDocumentUrls.getImageUrl(_url);
fReplaceCallback(_url);
fApplyCallback();
return;
}
var rData = { var rData = {
"id": this.documentId, "id": this.documentId,
"userid": this.documentUserId, "userid": this.documentUserId,
......
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