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

Merge pull request #1333 from ONLYOFFICE/fix/sort-comments-position

Browse source 
Fix/sort comments position
This commit is contained in:
Julia Radzhabova 2021-11-18 21:31:45 +03:00 committed by GitHub
parent 43e0c5089b 96679e292c
commit c0d55a2aa1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -194,6 +194,7 @@ define([
this.api.asc_registerCallback('asc_onUpdateCommentPosition', _.bind(this.onApiUpdateCommentPosition, this)); this.api.asc_registerCallback('asc_onUpdateCommentPosition', _.bind(this.onApiUpdateCommentPosition, this));
this.api.asc_registerCallback('asc_onDocumentPlaceChanged', _.bind(this.onDocumentPlaceChanged, this)); this.api.asc_registerCallback('asc_onDocumentPlaceChanged', _.bind(this.onDocumentPlaceChanged, this));
this.api.asc_registerCallback('asc_onDeleteComment', _.bind(this.onDeleteComment, this)); // only for PE, when del or ctrl+x pressed this.api.asc_registerCallback('asc_onDeleteComment', _.bind(this.onDeleteComment, this)); // only for PE, when del or ctrl+x pressed
this.api.asc_registerCallback('asc_onChangeCommentLogicalPosition', _.bind(this.onApiChangeCommentLogicalPosition, this)); // change comments position in document
} }
}, },
@ -215,7 +216,11 @@ define([
Common.localStorage.setItem(this.appPrefix + "comments-sort", type); Common.localStorage.setItem(this.appPrefix + "comments-sort", type);
Common.Utils.InternalSettings.set(this.appPrefix + "comments-sort", type); Common.Utils.InternalSettings.set(this.appPrefix + "comments-sort", type);
if (type=='position') { if (type=='position-asc' || type=='position-desc') {
var direction = (type=='position-asc') ? 1 : -1;
this.collection.comparator = function (collection) {
return direction * collection.get('position');
};
} else if (type=='author-asc' || type=='author-desc') { } else if (type=='author-asc' || type=='author-desc') {
var direction = (type=='author-asc') ? 1 : -1; var direction = (type=='author-asc') ? 1 : -1;
this.collection.comparator = function(item1, item2) { this.collection.comparator = function(item1, item2) {
@ -727,7 +732,7 @@ define([
} else } else
this.collection.push(comment); this.collection.push(comment);
this.updateComments(true); this.updateComments(true, this.getComparator() === 'position-asc' || this.getComparator() === 'position-desc'); // don't sort by position
if (this.showPopover) { if (this.showPopover) {
if (null !== data.asc_getQuoteText()) { if (null !== data.asc_getQuoteText()) {
@ -747,7 +752,7 @@ define([
comment.get('groupName') ? this.addCommentToGroupCollection(comment) : this.collection.push(comment); comment.get('groupName') ? this.addCommentToGroupCollection(comment) : this.collection.push(comment);
} }
this.updateComments(true); this.updateComments(true, this.getComparator() === 'position-asc' || this.getComparator() === 'position-desc');
}, },
onApiRemoveComment: function (id, silentUpdate) { onApiRemoveComment: function (id, silentUpdate) {
for (var name in this.groupCollection) { for (var name in this.groupCollection) {
@ -1102,17 +1107,28 @@ define([
} }
}, },
onApiChangeCommentLogicalPosition: function (comments) {
for (var uid in comments) {
if (comments.hasOwnProperty(uid)) {
var comment = this.findComment(uid) || this.findCommentInGroup(uid);
comment && comment.set('position', comments[uid]);
}
}
(this.getComparator() === 'position-asc' || this.getComparator() === 'position-desc') && this.updateComments(true);
},
// internal // internal
updateComments: function (needRender, disableSort, loadText) { updateComments: function (needRender, disableSort, loadText) {
var me = this; var me = this;
me.updateCommentsTime = new Date(); me.updateCommentsTime = new Date();
me.disableSort = !!disableSort;
if (me.timerUpdateComments===undefined) if (me.timerUpdateComments===undefined)
me.timerUpdateComments = setInterval(function(){ me.timerUpdateComments = setInterval(function(){
if ((new Date()) - me.updateCommentsTime>100) { if ((new Date()) - me.updateCommentsTime>100) {
clearInterval(me.timerUpdateComments); clearInterval(me.timerUpdateComments);
me.timerUpdateComments = undefined; me.timerUpdateComments = undefined;
me.updateCommentsView(needRender, disableSort, loadText); me.updateCommentsView(needRender, me.disableSort, loadText);
} }
}, 25); }, 25);
}, },

1
apps/common/main/lib/model/Comment.js
View file

@ -66,6 +66,7 @@ define([
lockuserid : '', lockuserid : '',
unattached : false, unattached : false,
userdata : '', userdata : '',
position : -1,
id : Common.UI.getId(), // internal id : Common.UI.getId(), // internal
time : 0, time : 0,

30
apps/common/main/lib/view/Comments.js
View file

@ -361,21 +361,23 @@ define([
checkable: true, checkable: true,
checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'author-desc', checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'author-desc',
toggleGroup: 'sortcomments' toggleGroup: 'sortcomments'
},
{
caption: this.mniPositionAsc,
value: 'position-asc',
checkable: true,
visible: this.appPrefix==='de-',
checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-asc',
toggleGroup: 'sortcomments'
},
{
caption: this.mniPositionDesc,
value: 'position-desc',
checkable: true,
visible: this.appPrefix==='de-',
checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-desc',
toggleGroup: 'sortcomments'
} }
// {
// caption: this.mniPositionAsc,
// value: 'position-asc',
// checkable: true,
// checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-asc',
// toggleGroup: 'sortcomments'
// }
// {
// caption: this.mniPositionDesc,
// value: 'position-desc',
// checkable: true,
// checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-desc',
// toggleGroup: 'sortcomments'
// }
] ]
}) })
}); });