Yajbir-Malik/DocumentServer-v-9.2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Alexander Trofimov
2015-06-25 11:27:08 +03:00
parent dbf21ee32f
commit a10605c91f
174 changed files with 24121 additions and 8908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OfficeWeb/apps/common/main/lib/controller/Chat.js
View File

@@ -51,13 +51,13 @@
setMode: function (mode) {
this.mode = mode;
if (this.api) {
if (this.mode.canCoAuthoring) {
if (this.mode.canCoAuthoring && this.mode.canChat) {
this.api.asc_registerCallback("asc_onCoAuthoringChatReceiveMessage", _.bind(this.onReceiveMessage, this));
}
this.api.asc_registerCallback("asc_onAuthParticipantsChanged", _.bind(this.onUsersChanged, this));
this.api.asc_registerCallback("asc_onConnectionStateChanged", _.bind(this.onUserConnection, this));
this.api.asc_coAuthoringGetUsers();
if (this.mode.canCoAuthoring) {
if (this.mode.canCoAuthoring && this.mode.canChat) {
this.api.asc_coAuthoringChatGetMessages();
}
}

5
OfficeWeb/apps/common/main/lib/controller/Comments.js
View File

@@ -616,6 +616,9 @@ define(["core", "common/main/lib/model/Comment", "common/main/lib/collection/Com
if (hint && this.isSelectedComment && (0 === _.difference(this.uids, uids).length)) {
return;
}
if (this.mode && !this.mode.canComments) {
hint = true;
}
if (this.getPopover()) {
this.clearDummyComment();
if (this.isSelectedComment && (0 === _.difference(this.uids, uids).length)) {
@@ -817,7 +820,7 @@ define(["core", "common/main/lib/model/Comment", "common/main/lib/collection/Com
this.view.update();
},
disableHint: function (comment) {
if (comment) {
if (comment && this.mode.canComments) {
comment.set("hint", false);
this.isSelectedComment = true;
}

119
OfficeWeb/apps/common/main/lib/controller/History.js Normal file
View File

@@ -0,0 +1,119 @@
/*
* (c) Copyright Ascensio System SIA 2010-2015
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
define(["core", "common/main/lib/collection/HistoryVersions", "common/main/lib/view/History"], function () {
Common.Controllers.History = Backbone.Controller.extend(_.extend({
models: [],
collections: ["Common.Collections.HistoryVersions"],
views: ["Common.Views.History"],
initialize: function () {
this.currentChangeId = -1;
this.currentArrColors = [];
this.currentDocId = "";
this.currentDocIdPrev = "";
},
events: {},
onLaunch: function () {
this.panelHistory = this.createView("Common.Views.History", {
storeHistory: this.getApplication().getCollection("Common.Collections.HistoryVersions")
});
this.panelHistory.on("render:after", _.bind(this.onAfterRender, this));
Common.Gateway.on("sethistorydata", _.bind(this.onSetHistoryData, this));
},
setApi: function (api) {
this.api = api;
},
onAfterRender: function (historyView) {
historyView.viewHistoryList.on("item:click", _.bind(this.onSelectRevision, this));
historyView.btnBackToDocument.on("click", _.bind(this.onClickBackToDocument, this));
},
onSelectRevision: function (picker, item, record) {
var url = record.get("url"),
rev = record.get("revision");
this.currentChangeId = record.get("changeid");
this.currentArrColors = record.get("arrColors");
this.currentDocId = record.get("docId");
this.currentDocIdPrev = record.get("docIdPrev");
if (_.isEmpty(url)) {
_.delay(function () {
Common.Gateway.requestHistoryData(rev);
},
10);
} else {
var urlDiff = record.get("urlDiff"),
hist = new Asc.asc_CVersionHistory();
hist.asc_setDocId(_.isEmpty(urlDiff) ? this.currentDocId : this.currentDocIdPrev);
hist.asc_setUrl(url);
hist.asc_setUrlChanges(urlDiff);
hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors);
this.api.asc_showRevision(hist);
}
},
onSetHistoryData: function (opts) {
if (opts.data.error) {
var config = {
closable: false,
title: this.notcriticalErrorTitle,
msg: opts.data.error,
iconCls: "warn",
buttons: ["ok"]
};
Common.UI.alert(config);
} else {
var data = opts.data;
var historyStore = this.getApplication().getCollection("Common.Collections.HistoryVersions");
if (historyStore && data !== null) {
var rev, revisions = historyStore.findRevisions(data.version);
if (revisions && revisions.length > 0) {
for (var i = 0; i < revisions.length; i++) {
rev = revisions[i];
rev.set("url", opts.data.url);
rev.set("urlDiff", opts.data.urlDiff);
}
}
var hist = new Asc.asc_CVersionHistory();
hist.asc_setUrl(opts.data.url);
hist.asc_setUrlChanges(opts.data.urlDiff);
hist.asc_setDocId(_.isEmpty(opts.data.urlDiff) ? this.currentDocId : this.currentDocIdPrev);
hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors);
this.api.asc_showRevision(hist);
}
}
},
onClickBackToDocument: function () {
Common.Gateway.requestHistoryClose();
},
notcriticalErrorTitle: "Warning"
},
Common.Controllers.History || {}));
});