Commit 4a8b38c4 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@62492 954022d7-b5bf-4e40-9824-e11837661b57
parent d4f94fcf
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
var reconnectTimeout, attemptCount=0; var reconnectTimeout, attemptCount=0;
function initSocksJs(url,docsCoApi) { function initSocksJs(url, docsCoApi) {
var sockjs = new SockJS(url, null, {debug: true}); var sockjs = new SockJS(url, null, {debug: true});
sockjs.onopen = function () { sockjs.onopen = function () {
...@@ -189,11 +189,9 @@ ...@@ -189,11 +189,9 @@
return sockjs; return sockjs;
} }
SpellCheckApi.prototype.init = function (docid) { SpellCheckApi.prototype.init = function (docid) {
this._docid = docid; this._docid = docid;
//Begin send auth //Begin send auth
var docsCoApi = this;
this.sockjs_url = this._url + '/doc/'+docid+'/c'; this.sockjs_url = this._url + '/doc/'+docid+'/c';
this.sockjs = initSocksJs(this.sockjs_url, this); this.sockjs = initSocksJs(this.sockjs_url, this);
}; };
......
...@@ -7133,10 +7133,13 @@ function _onOpenCommand(fCallback, incomeObject) { ...@@ -7133,10 +7133,13 @@ function _onOpenCommand(fCallback, incomeObject) {
} }
if (result.changes && editor.VersionHistory) { if (result.changes && editor.VersionHistory) {
var arrColors = editor.VersionHistory.colors; var arrColors = editor.VersionHistory.colors, color;
for (var i = 0; i < result.changes.length; ++i) for (var i = 0; i < result.changes.length; ++i) {
editor._coAuthoringSetChanges(result.changes[i], color = arrColors[i];
arrColors[i] ? arrColors[i] : new CDocumentColor(191, 255, 199)); editor._coAuthoringSetChanges(result.changes[i], color ?
new CDocumentColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF) :
new CDocumentColor(191, 255, 199));
}
} }
if (result.bSerFormat) if (result.bSerFormat)
...@@ -7440,15 +7443,9 @@ asc_docs_api.prototype.asc_continueSaving = function () { ...@@ -7440,15 +7443,9 @@ asc_docs_api.prototype.asc_continueSaving = function () {
// Version History // Version History
asc_docs_api.prototype.asc_showRevision = function (newObj) { asc_docs_api.prototype.asc_showRevision = function (newObj) {
if (3 === arguments.length) { // ToDo убрать эту проверку
var tmp = arguments[0]; if (!newObj.docId)
newObj = new window["Asc"].asc_CVersionHistory();
newObj.docId = '1233211'; newObj.docId = '1233211';
newObj.url = tmp;
newObj.urlChanges = arguments[1];
newObj.currentChangeId = arguments[2];
newObj.colors = [];
}
var bUpdate = true; var bUpdate = true;
if (null === this.VersionHistory) if (null === this.VersionHistory)
......
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