Skip to content

S
sdkjs
Commit e41f0650 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

Добавил getViewMode в baseEditorsApi, _onOpenCommand, _onNeedParams, asc_coAuthoringDisconnect 

onDocumentOpen вынес в baseEditorsApi
_onOpenCommand delete from export

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66476 954022d7-b5bf-4e40-9824-e11837661b57
parent 8d9fc422
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 205 deletions
Common/apiBase.js
View file @ e41f0650
...@@ -165,6 +165,13 @@ baseEditorsApi.prototype.sync_TryUndoInFastCollaborative = function() ...@@ -165,6 +165,13 @@ baseEditorsApi.prototype.sync_TryUndoInFastCollaborative = function()
{ {
this.sendEvent("asc_OnTryUndoInFastCollaborative"); this.sendEvent("asc_OnTryUndoInFastCollaborative");
}; };
baseEditorsApi.prototype.getViewMode = function() {
};
// Open
baseEditorsApi.prototype._onOpenCommand = function(data) {
};
baseEditorsApi.prototype._onNeedParams = function(data) {
};
// Выставление интервала автосохранения (0 - означает, что автосохранения нет) // Выставление интервала автосохранения (0 - означает, что автосохранения нет)
baseEditorsApi.prototype.asc_setAutoSaveGap = function(autoSaveGap) { baseEditorsApi.prototype.asc_setAutoSaveGap = function(autoSaveGap) {
if (typeof autoSaveGap === "number") { if (typeof autoSaveGap === "number") {
...@@ -227,11 +234,58 @@ baseEditorsApi.prototype._coAuthoringInit = function() { ...@@ -227,11 +234,58 @@ baseEditorsApi.prototype._coAuthoringInit = 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.CoAuthoringApi.onDocumentOpen = function(inputWrap) {
if (inputWrap["data"]) {
var input = inputWrap["data"];
switch (input["type"]) {
case 'reopen':
case 'open':
switch (input["status"]) {
case "updateversion":
case "ok":
var urls = input["data"];
g_oDocumentUrls.init(urls);
if (null != urls['Editor.bin']) {
if ('ok' === input["status"] || t.getViewMode()) {
t._onOpenCommand(urls['Editor.bin']);
} else {
t.sendEvent("asc_onDocumentUpdateVersion", function() {
if (t.isCoAuthoringEnable) {
t.asc_coAuthoringDisconnect();
}
t._onOpenCommand(urls['Editor.bin']);
})
}
} else {
t.sendEvent("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.Critical);
}
break;
case "needparams":
t._onNeedParams(input["data"]);
break;
case "err":
t.sendEvent("asc_onError", g_fMapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.Critical);
break;
}
break;
default:
if (t.fCurCallback) {
t.fCurCallback(input);
t.fCurCallback = null;
} else {
t.sendEvent("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
break;
}
}
};
this._coAuthoringInitEnd(); this._coAuthoringInitEnd();
}; };
baseEditorsApi.prototype._coAuthoringInitEnd = function() { baseEditorsApi.prototype._coAuthoringInitEnd = function() {
}; };
baseEditorsApi.prototype.asc_coAuthoringDisconnect = function() {
};
// SpellCheck // SpellCheck
baseEditorsApi.prototype._coSpellCheckInit = function() { baseEditorsApi.prototype._coSpellCheckInit = function() {
}; };
......
Excel/api.js
View file @ e41f0650
...@@ -639,22 +639,44 @@ var editor; ...@@ -639,22 +639,44 @@ var editor;
return this.wbModel.getWorksheet(sheetIndex).PagePrintOptions; return this.wbModel.getWorksheet(sheetIndex).PagePrintOptions;
}; };
spreadsheet_api.prototype._onOpenCommand = function(callback, data) { spreadsheet_api.prototype._onNeedParams = function(data) {
var t = this;
// Проверяем, возможно нам пришли опции для CSV
if (this.documentOpenOptions) {
var codePageCsv = c_oAscEncodingsMap[this.documentOpenOptions["codePage"]] || c_oAscCodePageUtf8, delimiterCsv = this.documentOpenOptions["delimiter"];
if (null != codePageCsv && null != delimiterCsv) {
this.asc_setAdvancedOptions(c_oAscAdvancedOptionsID.CSV, new asc.asc_CCSVAdvancedOptions(codePageCsv, delimiterCsv));
return;
}
}
if (data) {
asc_ajax({
url: data,
dataType: "text",
success: function(result) {
var cp = JSON.parse(result);
cp['encodings'] = getEncodingParams();
t.handlers.trigger("asc_onAdvancedOptions", new asc.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.CSV, cp), t.advancedOptionsAction);
},
error: function() {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.Critical);
}
});
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
};
spreadsheet_api.prototype._onOpenCommand = function(data) {
var t = this; var t = this;
g_fOpenFileCommand(data, this.documentUrlChanges, Asc.c_oSerFormat.Signature, function(error, result) { g_fOpenFileCommand(data, this.documentUrlChanges, Asc.c_oSerFormat.Signature, function(error, result) {
if (error || !result.bSerFormat) { if (error || !result.bSerFormat) {
var oError = {returnCode: c_oAscError.Level.Critical, val: c_oAscError.ID.Unknown}; var oError = {returnCode: c_oAscError.Level.Critical, val: c_oAscError.ID.Unknown};
t.handlers.trigger("asc_onError", oError.val, oError.returnCode); t.handlers.trigger("asc_onError", oError.val, oError.returnCode);
if (callback) {
callback(oError);
}
return; return;
} }
var wb = t._openDocument(result.data); var wb = t._openDocument(result.data);
if (callback) { t._startOpenDocument({returnCode: 0, val: wb});
callback({returnCode: 0, val: wb});
}
}); });
}; };
...@@ -1307,84 +1329,6 @@ var editor; ...@@ -1307,84 +1329,6 @@ var editor;
t.handlers.trigger("asc_onError", isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical); t.handlers.trigger("asc_onError", isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
} }
}; };
this.CoAuthoringApi.onDocumentOpen = function(inputWrap) {
if (inputWrap["data"]) {
var input = inputWrap["data"];
switch (input["type"]) {
case 'reopen':
case 'open':
{
switch (input["status"]) {
case "updateversion":
case "ok":
var urls = input["data"];
g_oDocumentUrls.init(urls);
if (null != urls['Editor.bin']) {
if ('ok' === input["status"] || t.getViewMode()) {
t._onOpenCommand(function(response) {
t._startOpenDocument(response);
}, urls['Editor.bin']);
} else {
t.handlers.trigger("asc_onDocumentUpdateVersion", function () {
if (t.isCoAuthoringEnable) {
t.asc_coAuthoringDisconnect();
}
t._onOpenCommand(function(response) {
t._startOpenDocument(response);
}, urls['Editor.bin']);
});
}
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.Critical);
}
break;
case "needparams":
// Проверяем, возможно нам пришли опции для CSV
if (t.documentOpenOptions) {
var codePageCsv = c_oAscEncodingsMap[t.documentOpenOptions["codePage"]] || c_oAscCodePageUtf8,
delimiterCsv = t.documentOpenOptions["delimiter"];
if (null !== codePageCsv && undefined !== codePageCsv && null !== delimiterCsv && undefined !== delimiterCsv) {
t.asc_setAdvancedOptions(c_oAscAdvancedOptionsID.CSV, new asc.asc_CCSVAdvancedOptions(codePageCsv, delimiterCsv));
break;
}
}
if(input["data"]) {
asc_ajax({
url: input["data"],
dataType: "text",
success: function(result) {
var cp = JSON.parse(result);
cp['encodings'] = getEncodingParams();
t.handlers.trigger("asc_onAdvancedOptions", new asc.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.CSV, cp), t.advancedOptionsAction);
},
error: function() {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.Critical);
if (fCallback) {
fCallback({returnCode: c_oAscError.Level.Critical, val: c_oAscError.ID.Unknown});
}
}
});
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
break;
case "err":
t.handlers.trigger("asc_onError", g_fMapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.Critical);
break;
}
}
break;
default:
if (t.fCurCallback) {
t.fCurCallback(input);
t.fCurCallback = null;
} else {
t.handlers.trigger("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
break;
}
}
};
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);
}; };
......
PowerPoint/api.js
View file @ e41f0650
...@@ -380,53 +380,6 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -380,53 +380,6 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
t.sync_ErrorCallback(isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical); t.sync_ErrorCallback(isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
} }
}; };
this.CoAuthoringApi.onDocumentOpen = function(inputWrap) {
if (inputWrap["data"]) {
var input = inputWrap["data"];
switch (input["type"]) {
case 'open':
{
switch (input["status"]) {
case "updateversion":
case "ok":
var urls = input["data"];
g_oDocumentUrls.init(urls);
if (null != urls['Editor.bin']) {
if ('ok' === input["status"] || editor.isViewMode) {
_onOpenCommand(function() {
}, {'data': urls['Editor.bin']});
} else {
editor.asc_fireCallback("asc_onDocumentUpdateVersion", function() {
if (editor.isCoAuthoringEnable) {
editor.asc_coAuthoringDisconnect();
}
_onOpenCommand(function() {
}, {'data': urls['Editor.bin']});
});
}
} else {
t.asc_fireCallback("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.NoCritical);
}
break;
case "needparams":
break;
case "err":
t.asc_fireCallback("asc_onError", g_fMapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.Critical);
break;
}
}
break;
default:
if (t.fCurCallback) {
t.fCurCallback(input);
t.fCurCallback = null;
} else {
t.asc_fireCallback("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
break;
}
}
};
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);
}; };
...@@ -4857,21 +4810,20 @@ asc_docs_api.prototype.sync_ContextMenuCallback = function(Data) ...@@ -4857,21 +4810,20 @@ asc_docs_api.prototype.sync_ContextMenuCallback = function(Data)
this.asc_fireCallback("asc_onContextMenu", Data); this.asc_fireCallback("asc_onContextMenu", Data);
}; };
function _onOpenCommand(fCallback, incomeObject) { asc_docs_api.prototype._onOpenCommand = function(data) {
g_fOpenFileCommand(incomeObject["data"], editor.documentUrlChanges, c_oSerFormat.Signature, function (error, result) { var t = this;
g_fOpenFileCommand(data, this.documentUrlChanges, c_oSerFormat.Signature, function (error, result) {
if (error || !result.bSerFormat) { if (error || !result.bSerFormat) {
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical); t.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
if(fCallback) fCallback();
return; return;
} }
editor.OpenDocument2(result.url, result.data); t.OpenDocument2(result.url, result.data);
editor.DocumentOrientation = (null == editor.WordControl.m_oLogicDocument) ? true : !editor.WordControl.m_oLogicDocument.Orientation; t.DocumentOrientation = (null == t.WordControl.m_oLogicDocument) ? true : !t.WordControl.m_oLogicDocument.Orientation;
editor.sync_DocSizeCallback(Page_Width, Page_Height); t.sync_DocSizeCallback(Page_Width, Page_Height);
editor.sync_PageOrientCallback(editor.get_DocumentOrientation()); t.sync_PageOrientCallback(t.get_DocumentOrientation());
if(fCallback) fCallback();
}); });
} };
function _downloadAs(editor, filetype, actionType, options) function _downloadAs(editor, filetype, actionType, options)
{ {
if (!options) { if (!options) {
......
PowerPoint/apiExport.js
View file @ e41f0650
...@@ -442,7 +442,6 @@ CContextMenuData.prototype['get_Type'] = CContextMenuData.prototype.get_Type; ...@@ -442,7 +442,6 @@ CContextMenuData.prototype['get_Type'] = CContextMenuData.prototype.get_Type;
CContextMenuData.prototype['get_X'] = CContextMenuData.prototype.get_X; CContextMenuData.prototype['get_X'] = CContextMenuData.prototype.get_X;
CContextMenuData.prototype['get_Y'] = CContextMenuData.prototype.get_Y; CContextMenuData.prototype['get_Y'] = CContextMenuData.prototype.get_Y;
CContextMenuData.prototype['get_IsSlideSelect'] = CContextMenuData.prototype.get_IsSlideSelect; CContextMenuData.prototype['get_IsSlideSelect'] = CContextMenuData.prototype.get_IsSlideSelect;
window['_onOpenCommand'] = _onOpenCommand;
window['_downloadAs'] = _downloadAs; window['_downloadAs'] = _downloadAs;
window['CAscSlideTiming'] = CAscSlideTiming; window['CAscSlideTiming'] = CAscSlideTiming;
CAscSlideTiming.prototype['put_TransitionType'] = CAscSlideTiming.prototype.put_TransitionType; CAscSlideTiming.prototype['put_TransitionType'] = CAscSlideTiming.prototype.put_TransitionType;
......
Word/api.js
View file @ e41f0650
...@@ -1081,56 +1081,6 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() { ...@@ -1081,56 +1081,6 @@ asc_docs_api.prototype._coAuthoringInitEnd = function() {
t.sync_ErrorCallback(isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical); t.sync_ErrorCallback(isCloseCoAuthoring ? c_oAscError.ID.UserDrop : c_oAscError.ID.CoAuthoringDisconnect, c_oAscError.Level.NoCritical);
} }
}; };
this.CoAuthoringApi.onDocumentOpen = function(inputWrap) {
if (inputWrap["data"]) {
var input = inputWrap["data"];
switch (input["type"]) {
case 'reopen':
case 'open':
{
switch (input["status"]) {
case "updateversion":
case "ok":
var urls = input["data"];
g_oDocumentUrls.init(urls);
if (null != urls['Editor.bin']) {
if ('ok' === input["status"] || editor.isViewMode) {
_onOpenCommand(function() {
}, {'data': urls['Editor.bin']});
} else {
editor.asc_fireCallback("asc_onDocumentUpdateVersion", function() {
if (editor.isCoAuthoringEnable) {
editor.asc_coAuthoringDisconnect();
}
_onOpenCommand(function() {
}, {'data': urls['Editor.bin']});
});
}
} else {
t.asc_fireCallback("asc_onError", c_oAscError.ID.ConvertationError, c_oAscError.Level.Critical);
}
break;
case "needparams":
var cp = {'codepage': c_oAscCodePageUtf8, 'encodings': getEncodingParams()};
t.asc_fireCallback("asc_onAdvancedOptions", new asc.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.TXT, cp), t.advancedOptionsAction);
break;
case "err":
t.asc_fireCallback("asc_onError", g_fMapAscServerErrorToAscError(parseInt(input["data"])), c_oAscError.Level.Critical);
break;
}
}
break;
default:
if (t.fCurCallback) {
t.fCurCallback(input);
t.fCurCallback = null;
} else {
t.asc_fireCallback("asc_onError", c_oAscError.ID.Unknown, c_oAscError.Level.NoCritical);
}
break;
}
}
};
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);
}; };
...@@ -6457,26 +6407,29 @@ window["asc_nativeOnSpellCheck"] = function (response) ...@@ -6457,26 +6407,29 @@ window["asc_nativeOnSpellCheck"] = function (response)
editor.SpellCheckApi.onSpellCheck(response); editor.SpellCheckApi.onSpellCheck(response);
}; };
function _onOpenCommand(fCallback, incomeObject) { asc_docs_api.prototype._onNeedParams = function(data) {
g_fOpenFileCommand(incomeObject["data"], editor.documentUrlChanges, c_oSerFormat.Signature, function (error, result) { var cp = {'codepage': c_oAscCodePageUtf8, 'encodings': getEncodingParams()};
this.asc_fireCallback("asc_onAdvancedOptions", new asc.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.TXT, cp), this.advancedOptionsAction);
};
asc_docs_api.prototype._onOpenCommand = function(data) {
var t = this;
g_fOpenFileCommand(data, this.documentUrlChanges, c_oSerFormat.Signature, function (error, result) {
if (error) { if (error) {
editor.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical); t.asc_fireCallback("asc_onError",c_oAscError.ID.Unknown,c_oAscError.Level.Critical);
if(fCallback) fCallback();
return; return;
} }
if (result.changes && editor.VersionHistory) { if (result.changes && t.VersionHistory) {
editor.VersionHistory.changes = result.changes; t.VersionHistory.changes = result.changes;
editor.VersionHistory.applyChanges(editor); t.VersionHistory.applyChanges(t);
} }
if (result.bSerFormat) if (result.bSerFormat)
editor.OpenDocument2(result.url, result.data); t.OpenDocument2(result.url, result.data);
else else
editor.OpenDocument(result.url, result.data); t.OpenDocument(result.url, result.data);
if(fCallback) fCallback();
}); });
} };
function _downloadAs(editor, command, filetype, actionType, options, fCallbackRequest) { function _downloadAs(editor, command, filetype, actionType, options, fCallbackRequest) {
if (!options) { if (!options) {
options = {}; options = {};
......
Word/apiExport.js
View file @ e41f0650
...@@ -727,7 +727,6 @@ asc_CCommentDataWord.prototype['asc_putSolved'] = asc_CCommentDataWord.prototype ...@@ -727,7 +727,6 @@ asc_CCommentDataWord.prototype['asc_putSolved'] = asc_CCommentDataWord.prototype
asc_CCommentDataWord.prototype['asc_getReply'] = asc_CCommentDataWord.prototype.asc_getReply; asc_CCommentDataWord.prototype['asc_getReply'] = asc_CCommentDataWord.prototype.asc_getReply;
asc_CCommentDataWord.prototype['asc_addReply'] = asc_CCommentDataWord.prototype.asc_addReply; asc_CCommentDataWord.prototype['asc_addReply'] = asc_CCommentDataWord.prototype.asc_addReply;
asc_CCommentDataWord.prototype['asc_getRepliesCount'] = asc_CCommentDataWord.prototype.asc_getRepliesCount; asc_CCommentDataWord.prototype['asc_getRepliesCount'] = asc_CCommentDataWord.prototype.asc_getRepliesCount;
window['_onOpenCommand'] = _onOpenCommand;
window['_downloadAs'] = _downloadAs; window['_downloadAs'] = _downloadAs;
window['_addImageUrl2'] = _addImageUrl2; window['_addImageUrl2'] = _addImageUrl2;
window['_isDocumentModified2'] = _isDocumentModified2; window['_isDocumentModified2'] = _isDocumentModified2;
......
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