Skip to content

S
sdkjs
Commit 1ddac4db authored by Boris Kocherov's avatar Boris Kocherov
Browse files
Options

use jio storrage for save document images 

disable "image upload blocking" on image jio save (probably it wrong)
use modified jio_putAttachment to save image:
* if attachId undefined then attachId = mimeType,sha1hashOfFile
* not save in jio storage if attach with checksumm already exist
* return attachId
* allow dataUri instead blob
use modified jio_getAttachment allow get attachment as dataUrl or
blobUrl (ooffice use blobUrl)
parent e56fb896
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 605 deletions
cell/Local/api_jio.js
View file @ 1ddac4db
...@@ -80,26 +80,6 @@ var c_oAscError = Asc.c_oAscError; ...@@ -80,26 +80,6 @@ var c_oAscError = Asc.c_oAscError;
cp['encodings'] = AscCommon.getEncodingParams(); cp['encodings'] = AscCommon.getEncodingParams();
this.handlers.trigger("asc_onAdvancedOptions", new AscCommon.asc_CAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, cp), AscCommon.c_oAscAdvancedOptionsAction.Open); this.handlers.trigger("asc_onAdvancedOptions", new AscCommon.asc_CAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, cp), AscCommon.c_oAscAdvancedOptionsAction.Open);
}; };
asc['spreadsheet_api'].prototype.asc_addImageDrawingObject = function(url)
{
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
var ws = this.wb.getWorksheet();
if (ws)
{
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
ws.objectRender.addImageDrawingObject(AscCommon.g_oDocumentUrls.getImageUrl(_url) , null);
}
};
asc['spreadsheet_api'].prototype.asc_showImageFileDialog = function()
{
window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
};
asc['spreadsheet_api'].prototype.asc_addImage = function()
{
window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
};
})(jQuery, window); })(jQuery, window);
window["Asc"]['spreadsheet_api'].prototype.asc_setAdvancedOptions = function(idOption, option) window["Asc"]['spreadsheet_api'].prototype.asc_setAdvancedOptions = function(idOption, option)
......
cell/api.js
View file @ 1ddac4db
...@@ -2215,49 +2215,32 @@ var editor; ...@@ -2215,49 +2215,32 @@ var editor;
return ret; return ret;
}; };
spreadsheet_api.prototype.asc_addImageDrawingObject = function (imageUrl) { spreadsheet_api.prototype.asc_addImageDrawingObject = function(imageUrl, callback) {
var rData = {
"id": this.documentId,
"userid": this.documentUserId,
"c": "imgurl",
"saveindex": g_oDocumentUrls.getMaxIndex(),
"data": imageUrl
};
var t = this; var t = this;
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); if (!callback) {
this.fCurCallback = function (input) { callback = function (url) {
if (null != input && "imgurl" == input["type"]) { //g_oDocumentUrls.addUrls(urls);
if ("ok" == input["status"]) { var ws = t.wb.getWorksheet();
var data = input["data"]; ws.objectRender.addImageDrawingObject('jio:' + url, null);
var urls = {}; };
var firstUrl; }
for (var i = 0; i < data.length; ++i) { //this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
var elem = data[i]; return new RSVP.Queue()
if (elem.url) { .push(function () {
if (!firstUrl) { return imageUrl;
firstUrl = elem.url; })
} .push(AscCommon.downloadUrlAsBlob)
urls[elem.path] = elem.url; .push(AscCommon.readBlobAsDataURL)
} .push(function (dataUrl) {
} return Common.Gateway.jio_putAttachment(t.documentId, undefined, dataUrl);
g_oDocumentUrls.addUrls(urls); })
if (firstUrl) { .push(callback)
var ws = t.wb.getWorksheet(); //.push(function () {t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);})
ws.objectRender.addImageDrawingObject(firstUrl, null); .push(undefined, function (error) {
} else { console.log(error);
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
} else {
t.handlers.trigger("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])),
c_oAscError.Level.NoCritical);
}
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical); t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
} //t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); });
};
sendCommand(this, null, rData);
}; };
...@@ -2521,46 +2504,10 @@ var editor; ...@@ -2521,46 +2504,10 @@ var editor;
return; return;
} }
var rData = { this.asc_addImageDrawingObject(sImageUrl, function (url) {
"id": this.documentId, fReplaceCallback('jio:' + url);
"userid": this.documentUserId, ws.objectRender.setGraphicObjectProps(props);
"c": "imgurl", });
"saveindex": g_oDocumentUrls.getMaxIndex(),
"data": sImageUrl};
var t = this;
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
this.fCurCallback = function(input) {
if (null != input && "imgurl" == input["type"]) {
if ("ok" == input["status"]) {
var data = input["data"];
var urls = {};
var firstUrl;
for (var i = 0; i < data.length; ++i) {
var elem = data[i];
if (elem.url) {
if (!firstUrl) {
firstUrl = elem.url;
}
urls[elem.path] = elem.url;
}
}
g_oDocumentUrls.addUrls(urls);
if (firstUrl) {
fReplaceCallback(firstUrl);
ws.objectRender.setGraphicObjectProps(props);
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
} else {
t.handlers.trigger("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
}
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
};
sendCommand(this, null, rData);
} }
else{ else{
ws.objectRender.setGraphicObjectProps(props); ws.objectRender.setGraphicObjectProps(props);
......
common/GlobalLoaders.js
View file @ 1ddac4db
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
this.Api = _api; this.Api = _api;
this.embedded_cut_manager.Api = _api; this.embedded_cut_manager.Api = _api;
}; };
this.LoadEmbeddedFonts = function(url, _fonts) this.LoadEmbeddedFonts = function(url, _fonts)
{ {
this.embeddedFilesPath = url; this.embeddedFilesPath = url;
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
oThis.Api.OpenDocumentProgress.CurrentFont++; oThis.Api.OpenDocumentProgress.CurrentFont++;
oThis.Api.SendOpenProgress(); oThis.Api.SendOpenProgress();
} }
oThis.fonts_loading_after_style[oThis.fonts_loading_after_style.length] = oThis.fonts_loading[0]; oThis.fonts_loading_after_style[oThis.fonts_loading_after_style.length] = oThis.fonts_loading[0];
oThis.fonts_loading.shift(); oThis.fonts_loading.shift();
oThis._LoadFonts(); oThis._LoadFonts();
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
{ {
this.embeddedFontFiles[font_index].SetStreamIndex(stream_index); this.embeddedFontFiles[font_index].SetStreamIndex(stream_index);
}; };
function CGlobalImageLoader() function CGlobalImageLoader()
{ {
this.map_image_index = {}; this.map_image_index = {};
...@@ -566,137 +566,105 @@ ...@@ -566,137 +566,105 @@
} }
} }
}; };
this.LoadDocumentImages = function(_images, isUrl) this.LoadDocumentImages = function (_images, isUrl) {
{ var oThis = this,
// сначала заполним массив images = [];
if (this.ThemeLoader == null) if (this.ThemeLoader === null)
this.Api.asyncImagesDocumentStartLoaded(); this.Api.asyncImagesDocumentStartLoaded();
else else
this.ThemeLoader.asyncImagesStartLoaded(); this.ThemeLoader.asyncImagesStartLoaded();
if (!this.bIsAsyncLoadDocumentImages) {
this.images_loading = []; for (var id in _images) {
images.push(AscCommon.getFullImageSrc2(_images[id]));
for (var id in _images) }
{ return RSVP.all(images.map(function (image_id) {
this.images_loading[this.images_loading.length] = AscCommon.getFullImageSrc2(_images[id]); return oThis._LoadImage(image_id)
} .push(function () {
if (oThis.bIsLoadDocumentFirst === true) {
if (!this.bIsAsyncLoadDocumentImages) oThis.Api.OpenDocumentProgress.CurrentImage++;
{ oThis.Api.SendOpenProgress();
this._LoadImages(); }
}
else });
{ }))
var _len = this.images_loading.length; .then(function () {
for (var i = 0; i < _len; i++) if (oThis.ThemeLoader === null)
{ oThis.Api.asyncImagesDocumentEndLoaded();
this.LoadImageAsync(i); else
oThis.ThemeLoader.asyncImagesEndLoaded();
});
} else {
for (var id in _images) {
this._LoadImage(AscCommon.getFullImageSrc2(_images[id]))
.push(function (oImage) {
oThis.Api.asyncImageEndLoadedBackground(oImage);
});
} }
this.images_loading.splice(0, _len); if (this.ThemeLoader === null)
if (this.ThemeLoader == null)
this.Api.asyncImagesDocumentEndLoaded(); this.Api.asyncImagesDocumentEndLoaded();
else else
this.ThemeLoader.asyncImagesEndLoaded(); this.ThemeLoader.asyncImagesEndLoaded();
} }
}; };
var oThis = this; this._LoadImage = function (image_id, Type) {
this._LoadImages = function() var start = image_id.slice(0, 4),
{ queue,
if (0 == this.images_loading.length) oThis = this;
{ if (0 === start.indexOf('jio:')) {
if (this.ThemeLoader == null) queue = Common.Gateway.jio_getAttachment(this.Api.documentId, image_id.slice(4), 'asBlobURL')
this.Api.asyncImagesDocumentEndLoaded(); .push(undefined, function (error) {
else console.log(error);
this.ThemeLoader.asyncImagesEndLoaded(); return "";
});
return; } else {
} queue = new RSVP.Queue().push(function () {
return image_id;
var _id = this.images_loading[0]; });
var oImage = new CImage(_id); }
oImage.Status = ImageLoadStatus.Loading; queue.push(function (url) {
oImage.Image = new Image(); if (url === "") {
oThis.map_image_index[oImage.src] = oImage; url = image_id;
oImage.Image.onload = function(){
oImage.Status = ImageLoadStatus.Complete;
if (oThis.bIsLoadDocumentFirst === true)
{
oThis.Api.OpenDocumentProgress.CurrentImage++;
oThis.Api.SendOpenProgress();
} }
return new RSVP.Promise(function (resolve, reject) {
oThis.images_loading.shift(); var oImage = new CImage(image_id);
oThis._LoadImages(); oImage.Type = Type;
}; oImage.Status = ImageLoadStatus.Loading;
oImage.Image.onerror = function(){ oImage.Image = new Image();
oImage.Status = ImageLoadStatus.Complete; oThis.map_image_index[image_id] = oImage;
oImage.Image = null; oImage.Image.onload = function () {
oImage.Status = ImageLoadStatus.Complete;
if (oThis.bIsLoadDocumentFirst === true) resolve(oImage);
{ };
oThis.Api.OpenDocumentProgress.CurrentImage++; oImage.Image.onerror = function () {
oThis.Api.SendOpenProgress(); oImage.Image = null;
} oImage.Status = ImageLoadStatus.Complete;
resolve(oImage);
oThis.images_loading.shift(); };
oThis._LoadImages(); //oImage.Image.crossOrigin = 'anonymous';
}; oImage.Image.src = url;
//oImage.Image.crossOrigin = 'anonymous'; });
oImage.Image.src = oImage.src; });
return queue;
}; };
this.LoadImage = function(src, Type) this.LoadImage = function(src, Type) {
{ var _image = this.map_image_index[src],
var _image = this.map_image_index[src]; oThis = this;
if (undefined != _image) if (undefined !== _image)
return _image; return _image;
this.Api.asyncImageStartLoaded(); this.Api.asyncImageStartLoaded();
this._LoadImage(src, Type)
.push(function (oImage) {
oThis.Api.asyncImageEndLoaded(oImage);
});
var oImage = new CImage(src);
oImage.Type = Type;
oImage.Image = new Image();
oImage.Status = ImageLoadStatus.Loading;
oThis.map_image_index[oImage.src] = oImage;
oImage.Image.onload = function(){
oImage.Status = ImageLoadStatus.Complete;
oThis.Api.asyncImageEndLoaded(oImage);
};
oImage.Image.onerror = function(){
oImage.Image = null;
oImage.Status = ImageLoadStatus.Complete;
oThis.Api.asyncImageEndLoaded(oImage);
};
//oImage.Image.crossOrigin = 'anonymous';
oImage.Image.src = oImage.src;
return null; return null;
}; };
this.LoadImageAsync = function(i)
{
var _id = oThis.images_loading[i];
var oImage = new CImage(_id);
oImage.Status = ImageLoadStatus.Loading;
oImage.Image = new Image();
oThis.map_image_index[oImage.src] = oImage;
oImage.Image.onload = function(){
oImage.Status = ImageLoadStatus.Complete;
oThis.Api.asyncImageEndLoadedBackground(oImage);
};
oImage.Image.onerror = function(){
oImage.Status = ImageLoadStatus.Complete;
oImage.Image = null;
oThis.Api.asyncImageEndLoadedBackground(oImage);
};
//oImage.Image.crossOrigin = 'anonymous';
oImage.Image.src = oImage.src;
}
} }
var g_flow_anchor = new Image(); var g_flow_anchor = new Image();
......
common/Local/common_jio.js
View file @ 1ddac4db
...@@ -96,63 +96,69 @@ ...@@ -96,63 +96,69 @@
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
////////////// IMAGES //////////////////////// ////////////// IMAGES ////////////////////////
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
//var prot = AscCommon.DocumentUrls.prototype; var prot = AscCommon.DocumentUrls.prototype;
//prot.mediaPrefix = 'media/'; prot.mediaPrefix = 'media/';
//prot.init = function(urls) { prot.init = function(urls) {
//}; };
//prot.getUrls = function() { prot.getUrls = function() {
// return this.urls; return this.urls;
//}; };
//prot.addUrls = function(urls){ prot.addUrls = function(urls){
//}; };
//prot.addImageUrl = function(strPath, url){ prot.addImageUrl = function(strPath, url){
//}; };
//prot.getImageUrl = function(strPath){ prot.getImageUrl = function(url){
// if (0 === strPath.indexOf('theme')) var _first = "jio:";
// return null; if (0 === url.indexOf(_first))
// return url;
// if (window.editor && window.editor.ThemeLoader && window.editor.ThemeLoader.ThemesUrl != "" && strPath.indexOf(window.editor.ThemeLoader.ThemesUrl) == 0)
// return null; if (0 === url.indexOf('theme'))
// return null;
// return this.documentUrl + "/media/" + strPath;
//}; if (window.editor && window.editor.ThemeLoader && window.editor.ThemeLoader.ThemesUrl !== "" && url.indexOf(window.editor.ThemeLoader.ThemesUrl) === 0)
//prot.getImageLocal = function(url){ return null;
// var _first = this.documentUrl + "/media/";
// if (0 == url.indexOf(_first)) return _first + url;
// return url.substring(_first.length); //return this.documentUrl + "/media/" + strPath;
// };
// if (window.editor && window.editor.ThemeLoader && 0 == url.indexOf(editor.ThemeLoader.ThemesUrlAbs)) { prot.getImageLocal = function(url){
// return url.substring(editor.ThemeLoader.ThemesUrlAbs.length); //var _first = this.documentUrl + "/media/";
// } var _first = "jio:";
// if (0 === url.indexOf(_first))
// return null; return url.substring(_first.length);
//};
//prot.imagePath2Local = function(imageLocal){ if (window.editor && window.editor.ThemeLoader && 0 == url.indexOf(editor.ThemeLoader.ThemesUrlAbs)) {
// return this.getImageLocal(imageLocal); return url.substring(editor.ThemeLoader.ThemesUrlAbs.length);
//}; }
//prot.getUrl = function(strPath){
// if (0 === strPath.indexOf('theme')) return null;
// return null; };
// prot.imagePath2Local = function(imageLocal){
// if (window.editor && window.editor.ThemeLoader && window.editor.ThemeLoader.ThemesUrl != "" && strPath.indexOf(window.editor.ThemeLoader.ThemesUrl) == 0) return this.getImageLocal(imageLocal);
// return null; };
// prot.getUrl = function(strPath){
// return this.documentUrl + "/media/" + strPath; if (0 === strPath.indexOf('theme'))
//}; return null;
//prot.getLocal = function(url){
// return this.getImageLocal(url); if (window.editor && window.editor.ThemeLoader && window.editor.ThemeLoader.ThemesUrl != "" && strPath.indexOf(window.editor.ThemeLoader.ThemesUrl) == 0)
//}; return null;
//
//AscCommon.sendImgUrls = function(api, images, callback) return this.documentUrl + "/media/" + strPath;
//{ };
// var _data = []; prot.getLocal = function(url){
// for (var i = 0; i < images.length; i++) return this.getImageLocal(url);
// { };
// var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](images[i]);
// _data[i] = { url: images[i], path : AscCommon.g_oDocumentUrls.getImageUrl(_url) }; AscCommon.sendImgUrls = function(api, images, callback)
// } {
// callback(_data); var _data = [];
//}; for (var i = 0; i < images.length; i++)
{
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](images[i]);
_data[i] = { url: images[i], path : AscCommon.g_oDocumentUrls.getImageUrl(_url) };
}
callback(_data);
};
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
//////////////// SAVE ////////////////////// //////////////// SAVE //////////////////////
......
common/Local/jio.js
View file @ 1ddac4db
"use strict"; "use strict";
AscCommon.readBlobAsDataURL = function (blob) {
var fr = new FileReader();
return new RSVP.Promise(function (resolve, reject, notify) {
fr.addEventListener("load", function () {
resolve(fr.result);
});
fr.addEventListener("error", reject);
fr.addEventListener("progress", notify);
fr.readAsDataURL(blob);
}, function () {
fr.abort();
});
};
AscCommon.downloadUrlAsBlob = function (url) {
var xhr = new XMLHttpRequest();
return new RSVP.Promise(function (resolve, reject) {
xhr.open("GET", url);
xhr.responseType = "blob";//force the HTTP response, response-type header to be blob
xhr.onload = function () {
if (this.status === 200) {
resolve(xhr.response);
} else {
reject(this.status)
}
};
xhr.onerror = reject;
xhr.send();
}, function () {
xhr.abort();
});
};
AscCommon.baseEditorsApi.prototype.jio_open = function () { AscCommon.baseEditorsApi.prototype.jio_open = function () {
var t = this; var t = this;
Common.Gateway.jio_get(t.documentId) Common.Gateway.jio_get(t.documentId)
......
common/apiBase.js
View file @ 1ddac4db
...@@ -882,7 +882,6 @@ ...@@ -882,7 +882,6 @@
} }
else else
{ {
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
AscCommon.UploadImageFiles(files, this.documentId, this.documentUserId, this.CoAuthoringApi.get_jwt(), function(error, url) AscCommon.UploadImageFiles(files, this.documentId, this.documentUserId, this.CoAuthoringApi.get_jwt(), function(error, url)
{ {
if (c_oAscError.ID.No !== error) if (c_oAscError.ID.No !== error)
...@@ -893,7 +892,6 @@ ...@@ -893,7 +892,6 @@
{ {
t._addImageUrl(url); t._addImageUrl(url);
} }
t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
}); });
} }
}; };
......
common/editorscommon.js
View file @ 1ddac4db
...@@ -1001,36 +1001,32 @@ function InitDragAndDrop (oHtmlElement, callback) { ...@@ -1001,36 +1001,32 @@ function InitDragAndDrop (oHtmlElement, callback) {
} }
} }
function UploadImageFiles (files, documentId, documentUserId, jwt, callback) { function UploadImageFiles (files, documentId, documentUserId, jwt, callback) {
if (files.length > 0) { if (files.length > 0) {
var file = files[0]; var file = files[0],
var url = sUploadServiceLocalUrl + '/' + documentId + '/' + documentUserId + '/' + g_oDocumentUrls.getMaxIndex(); reader = new FileReader();
if (jwt) { reader.addEventListener('load', function () {
url += '/' + jwt; Common.Gateway.jio_putAttachment(documentId, undefined, reader.result)
} .push(function (image_url) {
var xhr = new XMLHttpRequest(); callback(Asc.c_oAscError.ID.No, 'jio:' + image_url);
xhr.open('POST', url, true); })
xhr.setRequestHeader('Content-Type', file.type || 'application/octet-stream'); .push(undefined, function (error) {
xhr.onreadystatechange = function() { console.log(error);
if (4 == this.readyState) { callback(Asc.c_oAscError.ID.Unknown);
if((this.status == 200 || this.status == 1223)) { });
var urls = JSON.parse(this.responseText); });
g_oDocumentUrls.addUrls(urls); reader.readAsDataURL(file);
var firstUrl; //// not worked. throw csp error
for (var i in urls) { //Common.Gateway.jio_putAttachment(documentId, undefined, URL.createObjectURL(file))
if (urls.hasOwnProperty(i)) { // .push(function (image_url) {
firstUrl = urls[i]; // callback(Asc.c_oAscError.ID.No, 'jio:' + image_url);
break; // })
} // .push(undefined, function (error) {
} // callback(Asc.c_oAscError.ID.Unknown);
callback(Asc.c_oAscError.ID.No, firstUrl); // throw error;
} else // });
callback(Asc.c_oAscError.ID.Unknown); } else {
} callback(Asc.c_oAscError.ID.Unknown);
}; }
xhr.send(file);
} else {
callback(Asc.c_oAscError.ID.Unknown);
}
} }
function ValidateUploadImage( files ) { function ValidateUploadImage( files ) {
var nRes = c_oAscServerError.NoError; var nRes = c_oAscServerError.NoError;
......
slide/Local/api_jio.js
View file @ 1ddac4db
...@@ -179,19 +179,6 @@ Asc['asc_docs_api'].prototype.asc_DownloadAs = function(typeFile, bIsDownloadEve ...@@ -179,19 +179,6 @@ Asc['asc_docs_api'].prototype.asc_DownloadAs = function(typeFile, bIsDownloadEve
this.asc_Save(false, true); this.asc_Save(false, true);
}; };
Asc['asc_docs_api'].prototype.AddImageUrl = function(url, imgProp)
{
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
this.AddImageUrlAction(AscCommon.g_oDocumentUrls.getImageUrl(_url), imgProp);
};
Asc['asc_docs_api'].prototype.AddImage = function()
{
window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
};
Asc['asc_docs_api'].prototype.asc_addImage = function()
{
window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
};
Asc['asc_docs_api'].prototype.asc_isOffline = function() Asc['asc_docs_api'].prototype.asc_isOffline = function()
{ {
return true; return true;
......
slide/api.js
View file @ 1ddac4db
...@@ -2700,58 +2700,11 @@ background-repeat: no-repeat;\ ...@@ -2700,58 +2700,11 @@ background-repeat: no-repeat;\
return; return;
} }
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); this.AddImageUrl(sImageUrl, function (url) {
this.fCurCallback = function(input) //g_oDocumentUrls.addUrls(urls);
{ image_url = 'jio:' + url;
if (null != input && "imgurl" == input["type"]) fApplyCallback();
{ });
if ("ok" == input["status"])
{
var data = input["data"];
var urls = {};
var firstUrl;
for (var i = 0; i < data.length; ++i)
{
var elem = data[i];
if (elem.url)
{
if (!firstUrl)
{
firstUrl = elem.url;
}
urls[elem.path] = elem.url;
}
}
g_oDocumentUrls.addUrls(urls);
if (firstUrl)
{
image_url = firstUrl;
fApplyCallback();
}
else
{
oApi.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
}
else
{
oApi.sendEvent("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
}
}
else
{
oApi.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
oApi.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
};
var rData = {
"id" : this.documentId,
"userid" : this.documentUserId,
"c" : "imgurl",
"saveindex" : g_oDocumentUrls.getMaxIndex(),
"data" : sImageUrl
};
sendCommand(this, null, rData);
} }
} }
else else
...@@ -3699,7 +3652,7 @@ background-repeat: no-repeat;\ ...@@ -3699,7 +3652,7 @@ background-repeat: no-repeat;\
// ToDo пока временная функция для стыковки. // ToDo пока временная функция для стыковки.
this.AddImageUrl(url); this.AddImageUrl(url);
}; };
asc_docs_api.prototype.AddImageUrl = function(url) asc_docs_api.prototype.AddImageUrl = function(url, callback)
{ {
if (g_oDocumentUrls.getLocal(url)) if (g_oDocumentUrls.getLocal(url))
{ {
...@@ -3707,59 +3660,34 @@ background-repeat: no-repeat;\ ...@@ -3707,59 +3660,34 @@ background-repeat: no-repeat;\
} }
else else
{ {
var rData = { var t = this,
"id" : this.documentId, start = url.slice(0, 6),
"userid" : this.documentUserId, queue = new RSVP.Queue();
"c" : "imgurl", if (!callback) {
"saveindex" : g_oDocumentUrls.getMaxIndex(), callback = function (url) {
"data" : url //g_oDocumentUrls.addUrls(urls);
}; t.AddImageUrlAction('jio:' + url);
};
var t = this; }
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); queue.push(function () {
this.fCurCallback = function(input) return url;
{ });
if (null != input && "imgurl" == input["type"]) //this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
{ if (0 !== start.indexOf('data:')) {
if ("ok" == input["status"]) queue
{ .push(AscCommon.downloadUrlAsBlob)
var data = input["data"]; .push(AscCommon.readBlobAsDataURL);
var urls = {}; }
var firstUrl; return queue.push(function (dataUrl) {
for (var i = 0; i < data.length; ++i) return Common.Gateway.jio_putAttachment(t.documentId, undefined, dataUrl);
{ })
var elem = data[i]; .push(callback)
if (elem.url) //.push(function () {t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);})
{ .push(undefined, function (error) {
if (!firstUrl) console.log(error);
{ t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
firstUrl = elem.url; //t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
} });
urls[elem.path] = elem.url;
}
}
g_oDocumentUrls.addUrls(urls);
if (firstUrl)
{
t.AddImageUrlAction(firstUrl);
}
else
{
t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
}
else
{
t.sendEvent("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
}
}
else
{
t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
};
sendCommand(this, null, rData);
} }
}; };
...@@ -3920,70 +3848,11 @@ background-repeat: no-repeat;\ ...@@ -3920,70 +3848,11 @@ background-repeat: no-repeat;\
} }
else else
{ {
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); this.AddImageUrl(sImageUrl, function (url) {
//g_oDocumentUrls.addUrls(urls);
if (window["AscDesktopEditor"]) ImagePr.ImageUrl = 'jio:' + url;
{ fApplyCallback();
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](sImageUrl); });
_url = g_oDocumentUrls.getImageUrl(_url);
ImagePr.ImageUrl = _url;
fApplyCallback();
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
return;
}
this.fCurCallback = function(input)
{
if (null != input && "imgurl" == input["type"])
{
if ("ok" == input["status"])
{
var data = input["data"];
var urls = {};
var firstUrl;
for (var i = 0; i < data.length; ++i)
{
var elem = data[i];
if (elem.url)
{
if (!firstUrl)
{
firstUrl = elem.url;
}
urls[elem.path] = elem.url;
}
}
g_oDocumentUrls.addUrls(urls);
if (firstUrl)
{
ImagePr.ImageUrl = firstUrl;
fApplyCallback();
}
else
{
oApi.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
}
else
{
oApi.sendEvent("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
}
}
else
{
oApi.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
oApi.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
};
var rData = {
"id" : this.documentId,
"userid" : this.documentUserId,
"c" : "imgurl",
"saveindex" : g_oDocumentUrls.getMaxIndex(),
"data" : sImageUrl
};
sendCommand(this, null, rData);
} }
} }
else else
......
word/Local/api_jio.js
View file @ 1ddac4db
...@@ -186,19 +186,6 @@ Asc['asc_docs_api'].prototype.asc_DownloadAs = function(typeFile, bIsDownloadEve ...@@ -186,19 +186,6 @@ Asc['asc_docs_api'].prototype.asc_DownloadAs = function(typeFile, bIsDownloadEve
this.asc_Save(false, true); this.asc_Save(false, true);
}; };
Asc['asc_docs_api'].prototype.AddImageUrl = function(url, imgProp)
{
var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](url);
this.AddImageUrlAction(AscCommon.g_oDocumentUrls.getImageUrl(_url), imgProp);
};
Asc['asc_docs_api'].prototype.AddImage = function()
{
window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
};
Asc['asc_docs_api'].prototype.asc_addImage = function()
{
window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
};
Asc['asc_docs_api'].prototype.asc_isOffline = function() Asc['asc_docs_api'].prototype.asc_isOffline = function()
{ {
return true; return true;
......
word/api.js
View file @ 1ddac4db
...@@ -4053,7 +4053,7 @@ background-repeat: no-repeat;\ ...@@ -4053,7 +4053,7 @@ background-repeat: no-repeat;\
// ToDo пока временная функция для стыковки. // ToDo пока временная функция для стыковки.
this.AddImageUrl(url); this.AddImageUrl(url);
}; };
asc_docs_api.prototype.AddImageUrl = function(url, imgProp) asc_docs_api.prototype.AddImageUrl = function(url, imgProp, callback)
{ {
if (g_oDocumentUrls.getLocal(url)) if (g_oDocumentUrls.getLocal(url))
{ {
...@@ -4061,59 +4061,30 @@ background-repeat: no-repeat;\ ...@@ -4061,59 +4061,30 @@ background-repeat: no-repeat;\
} }
else else
{ {
var rData = {
"id" : this.documentId,
"userid" : this.documentUserId,
"c" : "imgurl",
"saveindex" : g_oDocumentUrls.getMaxIndex(),
"data" : url
};
var t = this; var t = this;
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage); if (!callback) {
this.fCurCallback = function(input) callback = function (url) {
{ //g_oDocumentUrls.addUrls(urls);
if (null != input && "imgurl" == input["type"]) t.AddImageUrlAction('jio:' + url, imgProp);
{ };
if ("ok" == input["status"]) }
{ //this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
var data = input["data"]; return new RSVP.Queue()
var urls = {}; .push(function () {
var firstUrl; return url;
for (var i = 0; i < data.length; ++i) })
{ .push(AscCommon.downloadUrlAsBlob)
var elem = data[i]; .push(AscCommon.readBlobAsDataURL)
if (elem.url) .push(function (dataUrl) {
{ return Common.Gateway.jio_putAttachment(t.documentId, undefined, dataUrl);
if (!firstUrl) })
{ .push(callback)
firstUrl = elem.url; //.push(function () {t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);})
} .push(undefined, function (error) {
urls[elem.path] = elem.url; console.log(error);
} t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
} //t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
g_oDocumentUrls.addUrls(urls); });
if (firstUrl)
{
t.AddImageUrlAction(firstUrl, imgProp);
}
else
{
t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
}
else
{
t.sendEvent("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
}
}
else
{
t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
t.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
};
sendCommand(this, null, rData);
} }
}; };
asc_docs_api.prototype.AddImageUrlAction = function(url, imgProp) asc_docs_api.prototype.AddImageUrlAction = function(url, imgProp)
...@@ -4423,59 +4394,11 @@ background-repeat: no-repeat;\ ...@@ -4423,59 +4394,11 @@ background-repeat: no-repeat;\
return; return;
} }
var rData = { this.AddImageUrl(sImageToDownLoad, undefined, function (url) {
"id" : this.documentId, //g_oDocumentUrls.addUrls(urls);
"userid" : this.documentUserId, fReplaceCallback('jio:' + url);
"c" : "imgurl", fApplyCallback();
"saveindex" : g_oDocumentUrls.getMaxIndex(), });
"data" : sImageToDownLoad
};
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
this.fCurCallback = function(input)
{
if (null != input && "imgurl" == input["type"])
{
if ("ok" == input["status"])
{
var data = input["data"];
var urls = {};
var firstUrl;
for (var i = 0; i < data.length; ++i)
{
var elem = data[i];
if (elem.url)
{
if (!firstUrl)
{
firstUrl = elem.url;
}
urls[elem.path] = elem.url;
}
}
g_oDocumentUrls.addUrls(urls);
if (firstUrl)
{
fReplaceCallback(firstUrl);
fApplyCallback();
}
else
{
oApi.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
}
else
{
oApi.sendEvent("asc_onError", mapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.NoCritical);
}
}
else
{
oApi.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
oApi.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
};
sendCommand(this, null, rData);
} }
else else
{ {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7