Commit e69bcdff authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

дополнение к ревизии 56259

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56260 954022d7-b5bf-4e40-9824-e11837661b57
parent 168ee73d
...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
this.ppix = 96; this.ppix = 96;
this.ppiy = 96; this.ppiy = 96;
this.Api = null; this.Api = null;
this.fullUrl;
this.activeRange = null; this.activeRange = null;
this.lStorage = {}; this.lStorage = {};
...@@ -289,17 +290,8 @@ ...@@ -289,17 +290,8 @@
this.lStorage.htmlInShape = text; this.lStorage.htmlInShape = text;
else else
{ {
var api = window["Asc"]["editor"]; var fullUrl = this._getUseFullUrl();
var sProtocol = window.location.protocol; window.global_pptx_content_writer.Start_UseFullUrl(fullUrl);
var documentOrigin;
var sHost = window.location.host;
documentOrigin = "";
if(sProtocol && "" != sProtocol)
documentOrigin = sProtocol + "//" + sHost;
else
documentOrigin = sHost;
window.global_pptx_content_writer.Start_UseFullUrl(documentOrigin + g_sResourceServiceLocalUrl + api.documentId + "/");
var oBinaryFileWriter = new Asc.BinaryFileWriter(worksheet.model.workbook, worksheet.activeRange); var oBinaryFileWriter = new Asc.BinaryFileWriter(worksheet.model.workbook, worksheet.activeRange);
var sBase64 = oBinaryFileWriter.Write(); var sBase64 = oBinaryFileWriter.Write();
...@@ -741,6 +733,26 @@ ...@@ -741,6 +733,26 @@
doc.body.style.MozUserSelect = "text"; doc.body.style.MozUserSelect = "text";
}, },
_getUseFullUrl: function(recalculate)
{
if(this.fullUrl == undefined || recalculate === true)
{
var api = window["Asc"]["editor"];
var sProtocol = window.location.protocol;
var documentOrigin;
var sHost = window.location.host;
documentOrigin = "";
if(sProtocol && "" != sProtocol)
documentOrigin = sProtocol + "//" + sHost;
else
documentOrigin = sHost;
this.fullUrl = documentOrigin + g_sResourceServiceLocalUrl + api.documentId + "/";
}
return this.fullUrl;
},
_getStylesSelect: function (worksheet){ _getStylesSelect: function (worksheet){
document.body.style.MozUserSelect = ""; document.body.style.MozUserSelect = "";
delete document.body.style["-khtml-user-select"]; delete document.body.style["-khtml-user-select"];
......
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