Skip to content

S
sdkjs
Commit 885daab6 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

delete g_cAscCoAuthoringUrl, CoAuthoringUrl, isCoAuthoringEnable, asc_setCoAuthoringEnable 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64661 954022d7-b5bf-4e40-9824-e11837661b57
parent 2877746d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 49 deletions
Excel/api.js
View file @ 885daab6
......@@ -94,10 +94,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.User = undefined;
this.CoAuthoringApi = new CDocsCoApi();
this.collaborativeEditing = null;
this.isCoAuthoringEnable = true;
this.isDocumentCanSave = false; // Флаг, говорит о возможности сохранять документ (активна кнопка save или нет)
this.CoAuthoringUrl = ''; // Ссылка сервиса для совместного редактирования
this.SpellCheckUrl = ''; // Ссылка сервиса для проверки орфографии
this.VersionHistory = null; // Объект, который отвечает за точку в списке версий
......@@ -527,8 +525,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
var t = this;
if (this.DocInfo["OfflineApp"] && (true == this.DocInfo["OfflineApp"])) {
this.isCoAuthoringEnable = false;
window['scriptBridge'] = {};
this.offlineModeInit();
this.offlineModeLoadDocument();
......@@ -599,7 +595,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} else {
t.handlers.trigger("asc_onGetEditorPermissions", new asc_CAscEditorPermissions());
// Фиктивно инициализируем
t.CoAuthoringUrl = window['g_cAscCoAuthoringUrl'] ? window['g_cAscCoAuthoringUrl'] : '';
t.SpellCheckUrl = window['g_cAscSpellCheckUrl'] ? window['g_cAscSpellCheckUrl'] : '';
}
});
......@@ -850,10 +845,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.isUseEmbeddedCutFonts = bUse;
};
spreadsheet_api.prototype.asc_setCoAuthoringEnable = function(isCoAuthoringEnable) {
this.isCoAuthoringEnable = !!isCoAuthoringEnable;
};
/*
idOption идентификатор дополнительного параметра, пока c_oAscAdvancedOptionsID.CSV.
option - какие свойства применить, пока массив. для CSV объект asc_CCSVAdvancedOptions(codepage, delimiter)
......@@ -1395,7 +1386,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
var oSettings = response["data"];
//Set up coauthoring and spellcheker service
this.CoAuthoringUrl = oSettings['g_cAscCoAuthoringUrl'];
this.SpellCheckUrl = oSettings['g_cAscSpellCheckUrl'];
var oEditorPermissions = new asc_CAscEditorPermissions(oSettings);
......@@ -1466,16 +1456,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
spreadsheet_api.prototype._coAuthoringInit = function(fCallback) {
var t = this;
if (!this.isCoAuthoringEnable) {
this.CoAuthoringUrl = '';
}
//Если User не задан, отключаем коавторинг.
if (null == this.User || null == this.User.asc_getId()) {
this.User = new asc.asc_CUser();
this.User.asc_setId("Unknown");
this.User.asc_setUserName("Unknown");
this.CoAuthoringUrl = '';
}
this.collaborativeEditing = new asc_CCollaborativeEditing(/*handlers*/{
......@@ -3494,7 +3479,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
if (bUpdate) {
this.documentUrl = url;
this.documentUrlChanges = urlChanges;
this.isCoAuthoringEnable = false;
this.asc_LoadDocument();
}
};
......@@ -3675,7 +3659,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
asc["editor"] = this;
this.CoAuthoringUrl = '';
this.SpellCheckUrl = '';
this.User = new asc.asc_CUser();
......@@ -3854,7 +3837,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
prot["asc_setMobileVersion"] = prot.asc_setMobileVersion;
prot["asc_setViewerMode"] = prot.asc_setViewerMode;
prot["asc_setUseEmbeddedCutFonts"] = prot.asc_setUseEmbeddedCutFonts;
prot["asc_setCoAuthoringEnable"] = prot.asc_setCoAuthoringEnable;
prot["asc_setAdvancedOptions"] = prot.asc_setAdvancedOptions;
prot["asc_setPageOptions"] = prot.asc_setPageOptions;
prot["asc_getPageOptions"] = prot.asc_getPageOptions;
......
PowerPoint/api.js
View file @ 885daab6
......@@ -130,11 +130,9 @@ function asc_docs_api(name)
// CoAuthoring and Chat
this.User = undefined;
this.CoAuthoringApi = new CDocsCoApi();
this.isCoAuthoringEnable = true;
this.CoAuthoringApi.isPowerPoint = true;
this.isDocumentCanSave = false; // Флаг, говорит о возможности сохранять документ (активна кнопка save или нет)
this.CoAuthoringUrl = ''; // Ссылка сервиса для совместного редактирования
this.SpellCheckUrl = ''; // Ссылка сервиса для проверки орфографии
this.VersionHistory = null; // Объект, который отвечает за точку в списке версий
......@@ -243,15 +241,10 @@ asc_docs_api.prototype._coAuthoringInit = function (fCallback) {
return; // Error
}
if (!this.isCoAuthoringEnable)
this.CoAuthoringUrl = '';
if (null == this.User || null == this.User.asc_getId()) {
this.User = new Asc.asc_CUser();
this.User.asc_setId("Unknown");
this.User.asc_setUserName("Unknown");
this.CoAuthoringUrl = '';
}
var t = this;
......@@ -768,7 +761,6 @@ asc_docs_api.prototype.asc_getEditorPermissions = function() {
var asc_CAscEditorPermissions = window["Asc"].asc_CAscEditorPermissions;
t.asc_fireCallback("asc_onGetEditorPermissions", new asc_CAscEditorPermissions());
// Фиктивно инициализируем
t.CoAuthoringUrl = window['g_cAscCoAuthoringUrl'] ? window['g_cAscCoAuthoringUrl'] : '';
t.SpellCheckUrl = window['g_cAscSpellCheckUrl'] ? window['g_cAscSpellCheckUrl'] : '';
}
});
......@@ -788,7 +780,6 @@ asc_docs_api.prototype.asc_getEditorPermissionsCallback = function(response) {
var oSettings = response["data"];
//Set up coauthoring and spellcheker service
this.CoAuthoringUrl = oSettings['g_cAscCoAuthoringUrl'];
this.SpellCheckUrl = oSettings['g_cAscSpellCheckUrl'];
var asc_CAscEditorPermissions = window["Asc"].asc_CAscEditorPermissions;
......@@ -5029,10 +5020,6 @@ asc_docs_api.prototype.GetTextBoxInputMode = function()
{
return this.WordControl.TextBoxInputMode;
};
asc_docs_api.prototype.asc_setCoAuthoringEnable = function (isCoAuthoringEnable)
{
this.isCoAuthoringEnable = !!isCoAuthoringEnable;
};
asc_docs_api.prototype.sync_EndAddShape = function()
{
......@@ -5107,7 +5094,6 @@ asc_docs_api.prototype.asc_showRevision = function (url, urlChanges, currentChan
if (bUpdate) {
documentUrl = url;
documentUrlChanges = urlChanges;
this.isCoAuthoringEnable = false;
this.LoadDocument();
}
};
......@@ -5210,7 +5196,6 @@ window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, ve
{
this.DocumentUrl = "TeamlabNative";
this.CoAuthoringUrl = '';
this.SpellCheckUrl = '';
this.User = new Asc.asc_CUser();
......
PowerPoint/apiExport.js
View file @ 885daab6
......@@ -404,7 +404,6 @@ asc_docs_api.prototype['SlideTimingApplyToAll'] = asc_docs_api.prototype.SlideTi
asc_docs_api.prototype['SlideTransitionPlay'] = asc_docs_api.prototype.SlideTransitionPlay;
asc_docs_api.prototype['SetTextBoxInputMode'] = asc_docs_api.prototype.SetTextBoxInputMode;
asc_docs_api.prototype['GetTextBoxInputMode'] = asc_docs_api.prototype.GetTextBoxInputMode;
asc_docs_api.prototype['asc_setCoAuthoringEnable'] = asc_docs_api.prototype.asc_setCoAuthoringEnable;
asc_docs_api.prototype['sync_EndAddShape'] = asc_docs_api.prototype.sync_EndAddShape;
asc_docs_api.prototype['asc_getChartObject'] = asc_docs_api.prototype.asc_getChartObject;
asc_docs_api.prototype['asc_addChartDrawingObject'] = asc_docs_api.prototype.asc_addChartDrawingObject;
......
Word/api.js
View file @ 885daab6
......@@ -429,7 +429,6 @@ function asc_docs_api(name)
this.SpellCheckApi = (window["AscDesktopEditor"] === undefined) ? new CSpellCheckApi() : new CSpellCheckApi_desktop();
this.isSpellCheckEnable = true;
this.CoAuthoringUrl = ''; // Ссылка сервиса для совместного редактирования
this.SpellCheckUrl = ''; // Ссылка сервиса для проверки орфографии
// Chart
......@@ -748,7 +747,6 @@ asc_docs_api.prototype.asc_getEditorPermissions = function() {
var asc_CAscEditorPermissions = window["Asc"].asc_CAscEditorPermissions;
t.asc_fireCallback("asc_onGetEditorPermissions", new asc_CAscEditorPermissions());
// Фиктивно инициализируем
t.CoAuthoringUrl = window['g_cAscCoAuthoringUrl'] ? window['g_cAscCoAuthoringUrl'] : '';
t.SpellCheckUrl = window['g_cAscSpellCheckUrl'] ? window['g_cAscSpellCheckUrl'] : '';
}
});
......@@ -777,7 +775,6 @@ asc_docs_api.prototype.asc_getEditorPermissionsCallback = function(response) {
var oSettings = response["data"];
//Set up coauthoring and spellcheker service
this.CoAuthoringUrl = oSettings['g_cAscCoAuthoringUrl'];
this.SpellCheckUrl = oSettings['g_cAscSpellCheckUrl'];
var asc_CAscEditorPermissions = window["Asc"].asc_CAscEditorPermissions;
......@@ -1328,16 +1325,11 @@ asc_docs_api.prototype._coAuthoringInit = function(fCallback)
return; // Error
}
if (!this.isCoAuthoringEnable)
this.CoAuthoringUrl = '';
//Если User не задан, отключаем коавторинг.
if (null == this.User || null == this.User.asc_getId()) {
this.User = new Asc.asc_CUser();
this.User.asc_setId("Unknown");
this.User.asc_setUserName("Unknown");
this.CoAuthoringUrl = '';
}
var t = this;
......@@ -6958,11 +6950,6 @@ asc_docs_api.prototype.SetDrawImagePlaceParagraph = function(element_id, props)
this.WordControl.m_oDrawingDocument.DrawGuiCanvasTextProps(props);
};
asc_docs_api.prototype.asc_setCoAuthoringEnable = function (isCoAuthoringEnable)
{
this.isCoAuthoringEnable = !!isCoAuthoringEnable;
};
asc_docs_api.prototype.asc_getMasterCommentId = function()
{
return -1;
......@@ -7446,7 +7433,6 @@ window["asc_docs_api"].prototype["asc_nativeOpenFile"] = function(base64File, ve
{
this.DocumentUrl = "TeamlabNative";
this.CoAuthoringUrl = '';
this.SpellCheckUrl = '';
this.User = new Asc.asc_CUser();
......
Word/apiExport.js
View file @ 885daab6
......@@ -526,7 +526,6 @@ asc_docs_api.prototype['asyncImageEndLoaded2'] = asc_docs_api.prototype.asyncIma
asc_docs_api.prototype['OfflineAppDocumentStartLoad'] = asc_docs_api.prototype.OfflineAppDocumentStartLoad;
asc_docs_api.prototype['OfflineAppDocumentEndLoad'] = asc_docs_api.prototype.OfflineAppDocumentEndLoad;
asc_docs_api.prototype['SetDrawImagePlaceParagraph'] = asc_docs_api.prototype.SetDrawImagePlaceParagraph;
asc_docs_api.prototype['asc_setCoAuthoringEnable'] = asc_docs_api.prototype.asc_setCoAuthoringEnable;
asc_docs_api.prototype['asc_getMasterCommentId'] = asc_docs_api.prototype.asc_getMasterCommentId;
asc_docs_api.prototype['asc_getAnchorPosition'] = asc_docs_api.prototype.asc_getAnchorPosition;
asc_docs_api.prototype['asc_getChartObject'] = asc_docs_api.prototype.asc_getChartObject;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7