Commit c94150c1 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

для Bug 30289 - JS Error ''get_OfflineApp' of null' при открытии Embedded viewer

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64605 954022d7-b5bf-4e40-9824-e11837661b57
parent a83051f4
...@@ -526,7 +526,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -526,7 +526,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
spreadsheet_api.prototype.asc_LoadDocument = function (c_DocInfo) { spreadsheet_api.prototype.asc_LoadDocument = function (c_DocInfo) {
var t = this; var t = this;
//this.asc_setDocInfo(c_DocInfo); if(!this.DocInfo && c_DocInfo)
this.asc_setDocInfo(c_DocInfo);
if (this.DocInfo["OfflineApp"] && (true == this.DocInfo["OfflineApp"])) { if (this.DocInfo["OfflineApp"] && (true == this.DocInfo["OfflineApp"])) {
this.isCoAuthoringEnable = false; this.isCoAuthoringEnable = false;
......
...@@ -864,8 +864,8 @@ asc_docs_api.prototype.asc_setLocale = function(val) ...@@ -864,8 +864,8 @@ asc_docs_api.prototype.asc_setLocale = function(val)
}; };
asc_docs_api.prototype.LoadDocument = function(c_DocInfo) asc_docs_api.prototype.LoadDocument = function(c_DocInfo)
{ {
//this.asc_setDocInfo(c_DocInfo); if(!this.DocInfo && c_DocInfo)
this.asc_setDocInfo(c_DocInfo);
this.WordControl.m_oDrawingDocument.m_bIsOpeningDocument = true; this.WordControl.m_oDrawingDocument.m_bIsOpeningDocument = true;
......
...@@ -871,7 +871,8 @@ asc_docs_api.prototype.asc_setLocale = function(val) ...@@ -871,7 +871,8 @@ asc_docs_api.prototype.asc_setLocale = function(val)
}; };
asc_docs_api.prototype.LoadDocument = function(c_DocInfo) asc_docs_api.prototype.LoadDocument = function(c_DocInfo)
{ {
//this.asc_setDocInfo(c_DocInfo); if(!this.DocInfo && c_DocInfo)
this.asc_setDocInfo(c_DocInfo);
this.WordControl.m_oDrawingDocument.m_bIsOpeningDocument = true; this.WordControl.m_oDrawingDocument.m_bIsOpeningDocument = 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