Commit 811ea0a0 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

HtmlFile

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63753 954022d7-b5bf-4e40-9824-e11837661b57
parent da19bdd0
...@@ -4892,7 +4892,11 @@ PasteProcessor.prototype = ...@@ -4892,7 +4892,11 @@ PasteProcessor.prototype =
for(var image in this.oImages) for(var image in this.oImages)
{ {
var src = this.oImages[image]; var src = this.oImages[image];
if(0 == src.indexOf("file:")) if (undefined !== window["Native"] && undefined !== window["Native"]["GetImageUrl"])
{
this.oImages[image] = window["Native"]["GetImageUrl"](this.oImages[image]);
}
else if(0 == src.indexOf("file:"))
{ {
if (window["AscDesktopEditor"] !== undefined) if (window["AscDesktopEditor"] !== undefined)
{ {
......
...@@ -6415,6 +6415,14 @@ asc_docs_api.prototype.sync_SendProgress = function(Percents) ...@@ -6415,6 +6415,14 @@ asc_docs_api.prototype.sync_SendProgress = function(Percents)
asc_docs_api.prototype.pre_Paste = function(_fonts, _images, callback) asc_docs_api.prototype.pre_Paste = function(_fonts, _images, callback)
{ {
if (undefined !== window["Native"] && undefined !== window["Native"]["GetImageUrl"])
{
callback();
window.GlobalPasteFlag = false;
window.GlobalPasteFlagCounter = 0;
return;
}
this.pasteCallback = callback; this.pasteCallback = callback;
this.pasteImageMap = _images; this.pasteImageMap = _images;
...@@ -7541,6 +7549,9 @@ window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, ve ...@@ -7541,6 +7549,9 @@ window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, ve
else else
this.asc_fireCallback("asc_onError",c_oAscError.ID.MobileUnexpectedCharCount,c_oAscError.Level.Critical); this.asc_fireCallback("asc_onError",c_oAscError.ID.MobileUnexpectedCharCount,c_oAscError.Level.Critical);
} }
if (undefined != window["Native"])
return;
//callback //callback
this.DocumentOrientation = (null == editor.WordControl.m_oLogicDocument) ? true : !editor.WordControl.m_oLogicDocument.Orientation; this.DocumentOrientation = (null == editor.WordControl.m_oLogicDocument) ? true : !editor.WordControl.m_oLogicDocument.Orientation;
...@@ -7706,6 +7717,24 @@ window["asc_docs_api"].prototype["asc_nativeGetHtml"] = function() ...@@ -7706,6 +7717,24 @@ window["asc_docs_api"].prototype["asc_nativeGetHtml"] = function()
return _ret; return _ret;
}; };
window["asc_docs_api"].prototype["asc_AddHtml"] = function(_iframeId)
{
var ifr = document.getElementById(_iframeId);
var frameWindow = window.frames[_iframeId];
if (frameWindow)
{
if(null != frameWindow.document && null != frameWindow.document.body)
{
ifr.style.display = "block";
Editor_Paste_Exec(this, frameWindow.document.body, ifr);
}
}
if (ifr)
document.body.removeChild(ifr);
};
window["asc_docs_api"].prototype["asc_nativeCheckPdfRenderer"] = function(_memory1, _memory2) window["asc_docs_api"].prototype["asc_nativeCheckPdfRenderer"] = function(_memory1, _memory2)
{ {
if (true) if (true)
......
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