Commit b79e0826 authored by Alexey.Musinov's avatar Alexey.Musinov

ios collaboration

parent 03f625f4
...@@ -2199,7 +2199,7 @@ Asc['asc_docs_api'].prototype["Call_Menu_Event"] = function(type, _params) ...@@ -2199,7 +2199,7 @@ Asc['asc_docs_api'].prototype["Call_Menu_Event"] = function(type, _params)
var dataObject = JSON.parse(_params); var dataObject = JSON.parse(_params);
// console.log("JS - " + dataObject['type']); // console.log("JS - " + dataObject['type']);
switch (dataObject['type']) { switch (dataObject['type']) {
case 'auth' : case 'auth' :
...@@ -6052,7 +6052,14 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData) ...@@ -6052,7 +6052,14 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData)
this.ImageLoader.bIsLoadDocumentFirst = true; this.ImageLoader.bIsLoadDocumentFirst = true;
this.ImageLoader.LoadDocumentImages(this.WordControl.m_oLogicDocument.ImageMap, true); this.ImageLoader.LoadDocumentImages(this.WordControl.m_oLogicDocument.ImageMap, true);
this.WordControl.m_oLogicDocument.Continue_FastCollaborativeEditing(); this.WordControl.m_oLogicDocument.Continue_FastCollaborativeEditing();
this.ParcedDocument = true;
if (this.isStartCoAuthoringOnEndLoad)
{
this.CoAuthoringApi.onStartCoAuthoring(true);
this.isStartCoAuthoringOnEndLoad = false;
}
window["native"]["onEndLoadingFile"](); window["native"]["onEndLoadingFile"]();
...@@ -6062,22 +6069,22 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData) ...@@ -6062,22 +6069,22 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData)
}, 40); }, 40);
}; };
window["AscCommon"].getFullImageSrc2 = function (src) { window["AscCommon"].getFullImageSrc2 = function (src) {
console.log("getFullImageSrc2 : " + src); console.log("getFullImageSrc2 : " + src);
var start = src.slice(0, 6); var start = src.slice(0, 6);
if (0 === start.indexOf('theme') && editor.ThemeLoader){ if (0 === start.indexOf('theme') && editor.ThemeLoader){
return editor.ThemeLoader.ThemesUrlAbs + src; return editor.ThemeLoader.ThemesUrlAbs + src;
} }
if (0 !== start.indexOf('http:') && 0 !== start.indexOf('data:') && 0 !== start.indexOf('https:') && if (0 !== start.indexOf('http:') && 0 !== start.indexOf('data:') && 0 !== start.indexOf('https:') &&
0 !== start.indexOf('file:') && 0 !== start.indexOf('ftp:')){ 0 !== start.indexOf('file:') && 0 !== start.indexOf('ftp:')){
var srcFull = AscCommon.g_oDocumentUrls.getImageUrl(src); var srcFull = AscCommon.g_oDocumentUrls.getImageUrl(src);
if(srcFull){ if(srcFull){
window["native"]["loadUrlImage"](srcFull, src); window["native"]["loadUrlImage"](srcFull, src);
return srcFull; return srcFull;
} }
} }
return src; return src;
} }
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