Commit 338652d3 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил проблему во view-режиме. Перенес spellCheck в инициализацию.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62833 954022d7-b5bf-4e40-9824-e11837661b57
parent 9775b580
...@@ -1063,6 +1063,8 @@ asc_docs_api.prototype.InitEditor = function() ...@@ -1063,6 +1063,8 @@ asc_docs_api.prototype.InitEditor = function()
{ {
this.WordControl.m_oLogicDocument = new CDocument(this.WordControl.m_oDrawingDocument); this.WordControl.m_oLogicDocument = new CDocument(this.WordControl.m_oDrawingDocument);
this.WordControl.m_oDrawingDocument.m_oLogicDocument = this.WordControl.m_oLogicDocument; this.WordControl.m_oDrawingDocument.m_oLogicDocument = this.WordControl.m_oLogicDocument;
if (!this.isSpellCheckEnable)
this.WordControl.m_oLogicDocument.TurnOff_CheckSpelling();
if (this.WordControl.MobileTouchManager) if (this.WordControl.MobileTouchManager)
this.WordControl.MobileTouchManager.LogicDocument = this.WordControl.m_oLogicDocument; this.WordControl.MobileTouchManager.LogicDocument = this.WordControl.m_oLogicDocument;
...@@ -1536,6 +1538,7 @@ asc_docs_api.prototype.asc_coAuthoringDisconnect = function () { ...@@ -1536,6 +1538,7 @@ asc_docs_api.prototype.asc_coAuthoringDisconnect = function () {
if (!this.CoAuthoringApi) if (!this.CoAuthoringApi)
return; // Error return; // Error
this.CoAuthoringApi.disconnect(); this.CoAuthoringApi.disconnect();
this.isCoAuthoringEnable = false;
// Выставляем view-режим // Выставляем view-режим
this.SetViewMode(true); this.SetViewMode(true);
...@@ -1579,7 +1582,9 @@ asc_docs_api.prototype.asc_SpellCheckDisconnect = function() { ...@@ -1579,7 +1582,9 @@ asc_docs_api.prototype.asc_SpellCheckDisconnect = function() {
if (!this.SpellCheckApi) if (!this.SpellCheckApi)
return; // Error return; // Error
this.SpellCheckApi.disconnect(); this.SpellCheckApi.disconnect();
this.WordControl.m_oLogicDocument.TurnOff_CheckSpelling(); this.isSpellCheckEnable = false;
if (this.WordControl.m_oLogicDocument)
this.WordControl.m_oLogicDocument.TurnOff_CheckSpelling();
}; };
asc_docs_api.prototype._onUpdateDocumentCanSave = function () { asc_docs_api.prototype._onUpdateDocumentCanSave = function () {
...@@ -7481,6 +7486,8 @@ asc_docs_api.prototype.asc_continueSaving = function () { ...@@ -7481,6 +7486,8 @@ asc_docs_api.prototype.asc_continueSaving = function () {
asc_docs_api.prototype.asc_showRevision = function (newObj) { asc_docs_api.prototype.asc_showRevision = function (newObj) {
if (!newObj.docId) if (!newObj.docId)
return; return;
if (this.isCoAuthoringEnable)
this.asc_coAuthoringDisconnect();
var bUpdate = true; var bUpdate = true;
if (null === this.VersionHistory) if (null === this.VersionHistory)
...@@ -7493,8 +7500,6 @@ asc_docs_api.prototype.asc_showRevision = function (newObj) { ...@@ -7493,8 +7500,6 @@ asc_docs_api.prototype.asc_showRevision = function (newObj) {
this.DocInfo.put_Id(this.VersionHistory.docId); this.DocInfo.put_Id(this.VersionHistory.docId);
this.DocInfo.put_Url(this.VersionHistory.url); this.DocInfo.put_Url(this.VersionHistory.url);
documentUrlChanges = this.VersionHistory.urlChanges; documentUrlChanges = this.VersionHistory.urlChanges;
this.isCoAuthoringEnable = false;
this.isSpellCheckEnable = false;
this.LoadDocument(); this.LoadDocument();
} }
}; };
......
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