Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FIx Bug 36927. Refactoring comments for spreadsheet editor: load/render comments for current sheet only.

Browse source
This commit is contained in:
Julia Radzhabova 2018-11-16 16:44:11 +03:00
parent 8348a8d432
commit 90eaf7de72
7 changed files with 104 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/lib/collection/Comments.js
View file

@ -52,6 +52,7 @@ define([
Common.Collections.Comments = Backbone.Collection.extend({ Common.Collections.Comments = Backbone.Collection.extend({
model: Common.Models.Comment, model: Common.Models.Comment,
groups: null,
clearEditing: function () { clearEditing: function () {
this.each(function(comment) { this.each(function(comment) {

143
apps/common/main/lib/controller/Comments.js
View file

@ -150,6 +150,8 @@ define([
this.popoverComments.comparator = function (collection) { return collection.get('time'); }; this.popoverComments.comparator = function (collection) { return collection.get('time'); };
} }
this.groupCollection = [];
this.view = this.createView('Common.Views.Comments', { store: this.collection }); this.view = this.createView('Common.Views.Comments', { store: this.collection });
this.view.render(); this.view.render();
@ -229,12 +231,12 @@ define([
this.api.asc_removeComment(id); this.api.asc_removeComment(id);
} }
}, },
onResolveComment: function (uid, id) { onResolveComment: function (uid) {
var t = this, var t = this,
reply = null, reply = null,
addReply = null, addReply = null,
ascComment = buildCommentData(), // new asc_CCommentData(null), ascComment = buildCommentData(), // new asc_CCommentData(null),
comment = t.findComment(uid, id); comment = t.findComment(uid);
if (_.isUndefined(uid)) { if (_.isUndefined(uid)) {
uid = comment.get('uid'); uid = comment.get('uid');
@ -279,7 +281,7 @@ define([
onShowComment: function (id, selected) { onShowComment: function (id, selected) {
if (this.previewmode) return; if (this.previewmode) return;
var comment = this.findComment(id, undefined); var comment = this.findComment(id);
if (comment) { if (comment) {
if (null !== comment.get('quote')) { if (null !== comment.get('quote')) {
if (this.api) { if (this.api) {
@ -596,47 +598,40 @@ define([
if (filter) { if (filter) {
if (!this.view.isVisible()) { if (!this.view.isVisible()) {
this.view.needUpdateFilter = filter; this.view.needUpdateFilter = filter;
this.filter = { applyOnly = true;
property : filter.property,
value : filter.value
};
return;
} }
this.view.needUpdateFilter = false; this.filter = filter;
this.filter = { var me = this,
property : filter.property, comments = [];
value : filter.value this.filter.forEach(function(item){
}; if (!me.groupCollection[item])
me.groupCollection[item] = new Backbone.Collection([], { model: Common.Models.Comment});
comments = comments.concat(me.groupCollection[item].models);
});
this.collection.reset(comments);
this.collection.groups = this.filter;
if (!applyOnly) { if (!applyOnly) {
if (this.getPopover()) { if (this.getPopover()) {
this.getPopover().hide(); this.getPopover().hide();
} }
} this.view.needUpdateFilter = false;
var t = this, endComment = null; var end = true;
for (var i = this.collection.length - 1; i >= 0; --i) {
this.collection.each(function (model) { if (end) {
var prop = model.get(t.filter.property); this.collection.at(i).set('last', true, {silent: true});
if (prop) { } else {
model.set('hide', (null === prop.match(t.filter.value)), {silent: !!applyOnly}); if (this.collection.at(i).get('last')) {
this.collection.at(i).set('last', false, {silent: true});
}
}
end = false;
} }
this.view.render();
if (model.get('last')) {
model.set('last', false, {silent:!!applyOnly});
}
if (!model.get('hide')) {
endComment = model;
}
});
if (endComment) {
endComment.set('last', true, {silent: !!applyOnly});
}
if (!applyOnly)
this.view.update(); this.view.update();
}
} }
}, },
onAppAddComment: function (sender, to_doc) { onAppAddComment: function (sender, to_doc) {
@ -644,12 +639,23 @@ define([
this.addDummyComment(); this.addDummyComment();
}, },
addCommentToGroupCollection: function(comment) {
var groupname = comment.get('groupName');
if (!this.groupCollection[groupname])
this.groupCollection[groupname] = new Backbone.Collection([], { model: Common.Models.Comment});
this.groupCollection[groupname].push(comment);
},
// SDK // SDK
onApiAddComment: function (id, data) { onApiAddComment: function (id, data) {
var comment = this.readSDKComment(id, data); var comment = this.readSDKComment(id, data);
if (comment) { if (comment) {
this.collection.push(comment); if (comment.get('groupName')) {
this.addCommentToGroupCollection(comment);
(_.indexOf(this.collection.groups, comment.get('groupName'))>-1) && this.collection.push(comment);
} else
this.collection.push(comment);
this.updateComments(true); this.updateComments(true);
@ -668,12 +674,20 @@ define([
onApiAddComments: function (data) { onApiAddComments: function (data) {
for (var i = 0; i < data.length; ++i) { for (var i = 0; i < data.length; ++i) {
var comment = this.readSDKComment(data[i].asc_getId(), data[i]); var comment = this.readSDKComment(data[i].asc_getId(), data[i]);
this.collection.push(comment); comment.get('groupName') ? this.addCommentToGroupCollection(comment) : this.collection.push(comment);
} }
this.updateComments(true); this.updateComments(true);
}, },
onApiRemoveComment: function (id, silentUpdate) { onApiRemoveComment: function (id, silentUpdate) {
for (var name in this.groupCollection) {
var store = this.groupCollection[name],
model = store.findWhere({uid: id});
if (model) {
store.remove(model);
break;
}
}
if (this.collection.length) { if (this.collection.length) {
var model = this.collection.findWhere({uid: id}); var model = this.collection.findWhere({uid: id});
if (model) { if (model) {
@ -717,7 +731,7 @@ define([
replies = null, replies = null,
repliesCount = 0, repliesCount = 0,
dateReply = null, dateReply = null,
comment = this.findComment(id); comment = this.findComment(id) || this.findCommentInGroup(id);
if (comment) { if (comment) {
t = this; t = this;
@ -776,7 +790,7 @@ define([
} }
}, },
onApiLockComment: function (id,userId) { onApiLockComment: function (id,userId) {
var cur = this.findComment(id), var cur = this.findComment(id) || this.findCommentInGroup(id),
user = null; user = null;
if (cur) { if (cur) {
@ -792,7 +806,7 @@ define([
} }
}, },
onApiUnLockComment: function (id) { onApiUnLockComment: function (id) {
var cur = this.findComment(id); var cur = this.findComment(id) || this.findCommentInGroup(id);
if (cur) { if (cur) {
cur.set('lock', false); cur.set('lock', false);
this.getPopover() && this.getPopover().loadText(); this.getPopover() && this.getPopover().loadText();
@ -999,11 +1013,6 @@ define([
// internal // internal
updateComments: function (needRender, disableSort) { updateComments: function (needRender, disableSort) {
if (needRender && !this.view.isVisible()) {
this.view.needRender = needRender;
return;
}
var me = this; var me = this;
me.updateCommentsTime = new Date(); me.updateCommentsTime = new Date();
if (me.timerUpdateComments===undefined) if (me.timerUpdateComments===undefined)
@ -1017,6 +1026,12 @@ define([
}, },
updateCommentsView: function (needRender, disableSort) { updateCommentsView: function (needRender, disableSort) {
if (needRender && !this.view.isVisible()) {
this.view.needRender = needRender;
this.onUpdateFilter(this.filter, true);
return;
}
var i, end = true; var i, end = true;
if (_.isUndefined(disableSort)) { if (_.isUndefined(disableSort)) {
@ -1024,6 +1039,8 @@ define([
} }
if (needRender) { if (needRender) {
this.onUpdateFilter(this.filter, true);
for (i = this.collection.length - 1; i >= 0; --i) { for (i = this.collection.length - 1; i >= 0; --i) {
if (end) { if (end) {
this.collection.at(i).set('last', true, {silent: true}); this.collection.at(i).set('last', true, {silent: true});
@ -1035,24 +1052,25 @@ define([
end = false; end = false;
} }
this.onUpdateFilter(this.filter, true);
this.view.render(); this.view.render();
this.view.needRender = false; this.view.needRender = false;
} }
this.view.update(); this.view.update();
}, },
findComment: function (uid, id) { findComment: function (uid) {
if (_.isUndefined(uid)) {
return this.collection.findWhere({id: id});
}
return this.collection.findWhere({uid: uid}); return this.collection.findWhere({uid: uid});
}, },
findPopupComment: function (id) { findPopupComment: function (id) {
return this.popoverComments.findWhere({id: id}); return this.popoverComments.findWhere({id: id});
}, },
findCommentInGroup: function (id) {
for (var name in this.groupCollection) {
var store = this.groupCollection[name],
model = store.findWhere({uid: id});
if (model) return model;
}
},
closeEditing: function (id) { closeEditing: function (id) {
var t = this; var t = this;
@ -1117,8 +1135,21 @@ define([
// helpers // helpers
onUpdateUsers: function() { onUpdateUsers: function() {
var users = this.userCollection; var users = this.userCollection,
this.collection.each(function (model) { hasGroup = false;
for (var name in this.groupCollection) {
hasGroup = true;
this.groupCollection[name].each(function (model) {
var user = users.findOriginalUser(model.get('userid'));
model.set('usercolor', (user) ? user.get('color') : null, {silent: true});
model.get('replys').forEach(function (reply) {
user = users.findOriginalUser(reply.get('userid'));
reply.set('usercolor', (user) ? user.get('color') : null, {silent: true});
});
});
}
!hasGroup && this.collection.each(function (model) {
var user = users.findOriginalUser(model.get('userid')); var user = users.findOriginalUser(model.get('userid'));
model.set('usercolor', (user) ? user.get('color') : null, {silent: true}); model.set('usercolor', (user) ? user.get('color') : null, {silent: true});
@ -1135,7 +1166,8 @@ define([
readSDKComment: function (id, data) { readSDKComment: function (id, data) {
var date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) : var date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) :
((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime()))); ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())));
var user = this.userCollection.findOriginalUser(data.asc_getUserId()); var user = this.userCollection.findOriginalUser(data.asc_getUserId()),
groupname = id.match(/^(doc|sheet[0-9]+)_/);
var comment = new Common.Models.Comment({ var comment = new Common.Models.Comment({
uid : id, uid : id,
userid : data.asc_getUserId(), userid : data.asc_getUserId(),
@ -1155,7 +1187,8 @@ define([
showReplyInPopover : false, showReplyInPopover : false,
hideAddReply : !_.isUndefined(this.hidereply) ? this.hidereply : (this.showPopover ? true : false), hideAddReply : !_.isUndefined(this.hidereply) ? this.hidereply : (this.showPopover ? true : false),
scope : this.view, scope : this.view,
editable : this.mode.canEditComments || (data.asc_getUserId() == this.currentUserId) editable : this.mode.canEditComments || (data.asc_getUserId() == this.currentUserId),
groupName : (groupname && groupname.length>1) ? groupname[1] : null
}); });
if (comment) { if (comment) {
var replies = this.readSDKReplies(data); var replies = this.readSDKReplies(data);

13
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -151,11 +151,14 @@ define([
if (this.mode.canComments) { if (this.mode.canComments) {
this.api.asc_registerCallback('asc_onAddComment', _.bind(this.onApiAddComment, this)); this.api.asc_registerCallback('asc_onAddComment', _.bind(this.onApiAddComment, this));
this.api.asc_registerCallback('asc_onAddComments', _.bind(this.onApiAddComments, this)); this.api.asc_registerCallback('asc_onAddComments', _.bind(this.onApiAddComments, this));
var collection = this.getApplication().getCollection('Common.Collections.Comments'); var comments = this.getApplication().getController('Common.Controllers.Comments').groupCollection;
for (var i = 0; i < collection.length; ++i) { for (var name in comments) {
if (collection.at(i).get('userid') !== this.mode.user.id) { var collection = comments[name];
this.leftMenu.markCoauthOptions('comments', true); for (var i = 0; i < collection.length; ++i) {
break; if (collection.at(i).get('userid') !== this.mode.user.id) {
this.leftMenu.markCoauthOptions('comments', true);
break;
}
} }
} }
} }

14
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -718,9 +718,7 @@ define([
if (window.styles_loaded || me.appOptions.isEditDiagram || me.appOptions.isEditMailMerge) { if (window.styles_loaded || me.appOptions.isEditDiagram || me.appOptions.isEditMailMerge) {
clearInterval(timer_sl); clearInterval(timer_sl);
Common.NotificationCenter.trigger('comments:updatefilter', Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + me.api.asc_getActiveWorksheetId()]);
{property: 'uid',
value: new RegExp('^(doc_|sheet' + me.api.asc_getActiveWorksheetId() + '_)')});
documentHolderView.createDelayedElements(); documentHolderView.createDelayedElements();
toolbarController.createDelayedElements(); toolbarController.createDelayedElements();
@ -1619,14 +1617,8 @@ define([
if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram && window.editor_elements_prepared) { if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram && window.editor_elements_prepared) {
this.application.getController('Statusbar').selectTab(index); this.application.getController('Statusbar').selectTab(index);
if (this.appOptions.isEdit && !this.dontCloseDummyComment) { if (this.appOptions.canComments && !this.dontCloseDummyComment) {
Common.NotificationCenter.trigger('comments:updatefilter', Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getWorksheetId(index)], false ); // hide popover
{
property: 'uid',
value: new RegExp('^(doc_|sheet' + this.api.asc_getWorksheetId(index) + '_)')
},
false // hide popover
);
} }
} }
}, },

11
apps/spreadsheeteditor/main/app/controller/Statusbar.js
View file

@ -384,9 +384,7 @@ define([
if (!_.isUndefined(silent)) { if (!_.isUndefined(silent)) {
me.api.asc_showWorksheet(items[index].inindex); me.api.asc_showWorksheet(items[index].inindex);
Common.NotificationCenter.trigger('comments:updatefilter', Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()]);
{property: 'uid',
value: new RegExp('^(doc_|sheet' + this.api.asc_getActiveWorksheetId() + '_)')});
if (!_.isUndefined(destPos)) { if (!_.isUndefined(destPos)) {
me.api.asc_moveWorksheet(items.length === destPos ? wc : items[destPos].inindex); me.api.asc_moveWorksheet(items.length === destPos ? wc : items[destPos].inindex);
@ -418,12 +416,7 @@ define([
this.api.asc_closeCellEditor(); this.api.asc_closeCellEditor();
this.api.asc_addWorksheet(this.createSheetName()); this.api.asc_addWorksheet(this.createSheetName());
Common.NotificationCenter.trigger('comments:updatefilter', Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()], false); // hide popover
{property: 'uid',
value: new RegExp('^(doc_|sheet' + this.api.asc_getActiveWorksheetId() + '_)')
},
false // hide popover
);
} }
Common.NotificationCenter.trigger('edit:complete', this.statusbar); Common.NotificationCenter.trigger('edit:complete', this.statusbar);
}, },

11
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -2825,17 +2825,6 @@ define([
// }); // });
}, },
onSheetChanged: function() {
if (this.api) {
var params = this.api.asc_getSheetViewSettings();
var menu = this.getMenuHideOptions();
if (menu) {
menu.items.getAt(3).setChecked(!params.asc_getShowRowColHeaders());
menu.items.getAt(4).setChecked(!params.asc_getShowGridLines());
}
}
},
_disableEditOptions: function(seltype, coauth_disable) { _disableEditOptions: function(seltype, coauth_disable) {
if (this.api.isCellEdited) return true; if (this.api.isCellEdited) return true;
if (this.api.isRangeSelection) return true; if (this.api.isRangeSelection) return true;

10
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -358,7 +358,7 @@ define([
me.fireEvent('sheet:changed', [me, sindex]); me.fireEvent('sheet:changed', [me, sindex]);
me.fireEvent('sheet:updateColors', [true]); me.fireEvent('sheet:updateColors', [true]);
Common.NotificationCenter.trigger('comments:updatefilter', {property: 'uid', value: new RegExp('^(doc_|sheet' + me.api.asc_getActiveWorksheetId() + '_)')}, false); Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + me.api.asc_getActiveWorksheetId()], false);
} }
}, },
@ -409,13 +409,7 @@ define([
this.fireEvent('sheet:changed', [this, tab.sheetindex]); this.fireEvent('sheet:changed', [this, tab.sheetindex]);
this.fireEvent('sheet:updateColors', [true]); this.fireEvent('sheet:updateColors', [true]);
Common.NotificationCenter.trigger('comments:updatefilter', // Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()], false); // hide popover
{
property: 'uid',
value: new RegExp('^(doc_|sheet' + this.api.asc_getActiveWorksheetId() + '_)')
},
false // hide popover
);
}, },
onTabMenu: function (o, index, tab) { onTabMenu: function (o, index, tab) {