Commit 2fc60116 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил функцию окончания инициализации совместного редактирования

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66462 954022d7-b5bf-4e40-9824-e11837661b57
parent f5adbcb0
...@@ -190,7 +190,7 @@ baseEditorsApi.prototype._onEndPermissions = function() { ...@@ -190,7 +190,7 @@ baseEditorsApi.prototype._onEndPermissions = function() {
} }
}; };
// CoAuthoring // CoAuthoring
baseEditorsApi.prototype._coAuthoringInitBase = function() { baseEditorsApi.prototype._coAuthoringInit = function() {
var t = this; var t = this;
//Если User не задан, отключаем коавторинг. //Если User не задан, отключаем коавторинг.
if (null == this.User || null == this.User.asc_getId()) { if (null == this.User || null == this.User.asc_getId()) {
...@@ -221,6 +221,10 @@ baseEditorsApi.prototype._coAuthoringInitBase = function() { ...@@ -221,6 +221,10 @@ baseEditorsApi.prototype._coAuthoringInitBase = function() {
this.CoAuthoringApi.onWarning = function(e) { this.CoAuthoringApi.onWarning = function(e) {
t.sendEvent('asc_onError', c_oAscError.ID.Warning, c_oAscError.Level.NoCritical); t.sendEvent('asc_onError', c_oAscError.ID.Warning, c_oAscError.Level.NoCritical);
}; };
this._coAuthoringInitEnd();
};
baseEditorsApi.prototype._coAuthoringInitEnd = function() {
}; };
// SpellCheck // SpellCheck
baseEditorsApi.prototype._coSpellCheckInit = function() { baseEditorsApi.prototype._coSpellCheckInit = function() {
......
...@@ -1056,7 +1056,7 @@ var editor; ...@@ -1056,7 +1056,7 @@ var editor;
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
///////////////////CoAuthoring and Chat api////////////////////////////// ///////////////////CoAuthoring and Chat api//////////////////////////////
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
spreadsheet_api.prototype._coAuthoringInit = function() { spreadsheet_api.prototype._coAuthoringInitEnd = function() {
var t = this; var t = this;
this.collaborativeEditing = new asc_CCollaborativeEditing(/*handlers*/{ this.collaborativeEditing = new asc_CCollaborativeEditing(/*handlers*/{
"askLock": function() { "askLock": function() {
...@@ -1391,7 +1391,6 @@ var editor; ...@@ -1391,7 +1391,6 @@ var editor;
} }
}; };
this._coAuthoringInitBase();
this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Spreadsheet, this.documentFormatSave); this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Spreadsheet, this.documentFormatSave);
}; };
......
...@@ -128,7 +128,7 @@ asc_docs_api.prototype._coAuthoringSetChanges = function(e, oColor) ...@@ -128,7 +128,7 @@ asc_docs_api.prototype._coAuthoringSetChanges = function(e, oColor)
this._coAuthoringSetChange(e[Index], oColor); this._coAuthoringSetChange(e[Index], oColor);
}; };
asc_docs_api.prototype._coAuthoringInit = function() { asc_docs_api.prototype._coAuthoringInitEnd = function() {
var t = this; var t = this;
this.CoAuthoringApi.onParticipantsChanged = function(e, count) { this.CoAuthoringApi.onParticipantsChanged = function(e, count) {
t.asc_fireCallback("asc_onParticipantsChanged", e, count); t.asc_fireCallback("asc_onParticipantsChanged", e, count);
...@@ -432,7 +432,6 @@ asc_docs_api.prototype._coAuthoringInit = function() { ...@@ -432,7 +432,6 @@ asc_docs_api.prototype._coAuthoringInit = function() {
} }
}; };
this._coAuthoringInitBase();
this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Presentation, this.documentFormatSave); this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Presentation, this.documentFormatSave);
}; };
......
...@@ -916,7 +916,7 @@ asc_docs_api.prototype._coAuthoringSetChanges = function(e, oColor) ...@@ -916,7 +916,7 @@ asc_docs_api.prototype._coAuthoringSetChanges = function(e, oColor)
this._coAuthoringSetChange(e[Index], oColor); this._coAuthoringSetChange(e[Index], oColor);
}; };
asc_docs_api.prototype._coAuthoringInit = function() { asc_docs_api.prototype._coAuthoringInitEnd = function() {
var t = this; var t = this;
this.CoAuthoringApi.onParticipantsChanged = function(e, CountEditUsers) { this.CoAuthoringApi.onParticipantsChanged = function(e, CountEditUsers) {
t.asc_fireCallback("asc_onParticipantsChanged", e, CountEditUsers); t.asc_fireCallback("asc_onParticipantsChanged", e, CountEditUsers);
...@@ -1136,7 +1136,6 @@ asc_docs_api.prototype._coAuthoringInit = function() { ...@@ -1136,7 +1136,6 @@ asc_docs_api.prototype._coAuthoringInit = function() {
} }
}; };
this._coAuthoringInitBase();
this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Word, this.documentFormatSave); this.CoAuthoringApi.init(this.User, this.documentId, this.documentCallbackUrl, 'fghhfgsjdgfjs', c_oEditorId.Word, this.documentFormatSave);
}; };
......
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