Commit 01f0fd03 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

delete unused CChatMessage

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66125 954022d7-b5bf-4e40-9824-e11837661b57
parent 1d050aac
......@@ -3292,7 +3292,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
spreadsheet_api.prototype.asc_coAuthoringChatSendMessage = function(message) {
this.CoAuthoringApi.sendMessage(message);
};
// get chart messages, возвращается массив CChatMessage
// get chart messages
spreadsheet_api.prototype.asc_coAuthoringChatGetMessages = function() {
this.CoAuthoringApi.getMessages();
};
......
......@@ -222,20 +222,6 @@ asc_docs_api.prototype.asc_GetFontThumbnailsPath = function()
/////////////////////////////////////////////////////////////////////////
///////////////////CoAuthoring and Chat api//////////////////////////////
/////////////////////////////////////////////////////////////////////////
function CChatMessage(user, message)
{
this.UserId = (undefined != user_id) ? user_id : null;
this.Message = (undefined != message) ? message : null;
}
CChatMessage.prototype.get_UserId = function() { return this.UserId; };
CChatMessage.prototype.get_Message = function() { return this.Message; };
/*
ToDo Register Callback OnCoAuthoringChatReceiveMessage return object CChatMessage (возможно возвращается МАСС�?В CChatMessage со всеми сообщениями)
ToDo Register Callback OnCoAuthoringConnectUser возвращается userId
ToDo Register Callback OnCoAuthoringDisconnectUser возвращается userId
*/
// Init CoAuthoring
asc_docs_api.prototype._coAuthoringInit = function() {
if (null == this.User || null == this.User.asc_getId()) {
......@@ -608,7 +594,7 @@ asc_docs_api.prototype.asc_coAuthoringDisconnect = function () {
asc_docs_api.prototype.asc_coAuthoringChatSendMessage = function (message) {
this.CoAuthoringApi.sendMessage(message);
};
// get chart messages, возвращается массив CChatMessage
// get chart messages
asc_docs_api.prototype.asc_coAuthoringChatGetMessages = function () {
this.CoAuthoringApi.getMessages();
};
......
......@@ -412,9 +412,6 @@ asc_docs_api.prototype['asc_undoAllChanges'] = asc_docs_api.prototype.asc_undoAl
asc_docs_api.prototype['sync_ContextMenuCallback'] = asc_docs_api.prototype.sync_ContextMenuCallback;
asc_docs_api.prototype['asc_addComment'] = asc_docs_api.prototype.asc_addComment;
asc_docs_api.prototype['asc_SetFastCollaborative'] = asc_docs_api.prototype.asc_SetFastCollaborative;
window['CChatMessage'] = CChatMessage;
CChatMessage.prototype['get_UserId'] = CChatMessage.prototype.get_UserId;
CChatMessage.prototype['get_Message'] = CChatMessage.prototype.get_Message;
window['OnSave_Callback'] = OnSave_Callback;
window['asc_CCommentData'] = asc_CCommentData;
asc_CCommentData.prototype['asc_getText'] = asc_CCommentData.prototype.asc_getText;
......
......@@ -1082,20 +1082,6 @@ asc_docs_api.prototype.get_PropertyThemeColorSchemes = function()
/////////////////////////////////////////////////////////////////////////
///////////////////CoAuthoring and Chat api//////////////////////////////
/////////////////////////////////////////////////////////////////////////
function CChatMessage(user, message)
{
this.UserId = (undefined != user_id) ? user_id : null;
this.Message = (undefined != message) ? message : null;
}
CChatMessage.prototype.get_UserId = function() { return this.UserId; };
CChatMessage.prototype.get_Message = function() { return this.Message; };
/*
ToDo Register Callback OnCoAuthoringChatReceiveMessage return object CChatMessage (возможно возвращается МАСС�?В CChatMessage со всеми сообщениями)
ToDo Register Callback OnCoAuthoringConnectUser возвращается userId
ToDo Register Callback OnCoAuthoringDisconnectUser возвращается userId
*/
// Init CoAuthoring
asc_docs_api.prototype._coAuthoringSetChange = function(change, oColor)
{
......@@ -1366,7 +1352,7 @@ asc_docs_api.prototype.asc_coAuthoringChatSendMessage = function(message)
{
this.CoAuthoringApi.sendMessage(message);
};
// get chart messages, возвращается массив CChatMessage
// get chart messages
asc_docs_api.prototype.asc_coAuthoringChatGetMessages = function()
{
this.CoAuthoringApi.getMessages();
......@@ -6813,33 +6799,33 @@ function _downloadAs(editor, command, filetype, actionType, options, fCallbackRe
dataContainer.data = dataContainer.data.length + ';' + dataContainer.data + JSON.stringify(aJsonOut);
}
var fCallback = null;
if (!options.isNoCallback) {
if (!options.isNoCallback) {
fCallback = function (input) {
var error = c_oAscError.ID.Unknown;
//input = {'type': command, 'status': 'err', 'data': -80};
if (null != input && command == input['type']) {
//input = {'type': command, 'status': 'err', 'data': -80};
if (null != input && command == input['type']) {
if ('ok' == input['status']){
if (options.isNoUrl) {
error = c_oAscError.ID.No;
} else {
var url = input['data'];
} else {
var url = input['data'];
if (url) {
error = c_oAscError.ID.No;
editor.processSavedFile(url, options.downloadType);
error = c_oAscError.ID.No;
editor.processSavedFile(url, options.downloadType);
}
}
}
} else {
error = g_fMapAscServerErrorToAscError(parseInt(input["data"]));
}
error = g_fMapAscServerErrorToAscError(parseInt(input["data"]));
}
}
if (c_oAscError.ID.No != error) {
editor.asc_fireCallback('asc_onError', options.errorDirect || error, c_oAscError.Level.NoCritical);
}
// Меняем тип состояния (на никакое)
}
// Меняем тип состояния (на никакое)
editor.advancedOptionsAction = c_oAscAdvancedOptionsAction.None;
if (actionType) {
if (actionType) {
editor.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, actionType);
}
}
};
}
editor.fCurCallback = fCallback;
......
......@@ -547,9 +547,6 @@ asc_docs_api.prototype['asc_undoAllChanges'] = asc_docs_api.prototype.asc_undoAl
asc_docs_api.prototype['asc_CloseFile'] = asc_docs_api.prototype.asc_CloseFile;
asc_docs_api.prototype['asc_addComment'] = asc_docs_api.prototype.asc_addComment;
asc_docs_api.prototype['asc_SetFastCollaborative'] = asc_docs_api.prototype.asc_SetFastCollaborative;
window['CChatMessage'] = CChatMessage;
CChatMessage.prototype['get_UserId'] = CChatMessage.prototype.get_UserId;
CChatMessage.prototype['get_Message'] = CChatMessage.prototype.get_Message;
window['CMathProp'] = CMathProp;
CMathProp.prototype['get_Type'] = CMathProp.prototype.get_Type;
window['CParagraphPropEx'] = CParagraphPropEx;
......
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