Fix Bug 40582. Refactoring rev. 71997cf64e
(4 Jun 2018)
This commit is contained in:
parent
004fe16e17
commit
5b834e4ca8
|
@ -1140,43 +1140,47 @@ define([
|
||||||
for (var name in this.groupCollection) {
|
for (var name in this.groupCollection) {
|
||||||
hasGroup = true;
|
hasGroup = true;
|
||||||
this.groupCollection[name].each(function (model) {
|
this.groupCollection[name].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});
|
color = (user) ? user.get('color') : null,
|
||||||
|
needrender = false;
|
||||||
|
if (color !== model.get('usercolor')) {
|
||||||
|
needrender = true;
|
||||||
|
model.set('usercolor', color, {silent: true});
|
||||||
|
}
|
||||||
|
|
||||||
model.get('replys').forEach(function (reply) {
|
model.get('replys').forEach(function (reply) {
|
||||||
user = users.findOriginalUser(reply.get('userid'));
|
user = users.findOriginalUser(reply.get('userid'));
|
||||||
reply.set('usercolor', (user) ? user.get('color') : null, {silent: true});
|
color = (user) ? user.get('color') : null;
|
||||||
|
if (color !== reply.get('usercolor')) {
|
||||||
|
needrender = true;
|
||||||
|
reply.set('usercolor', color, {silent: true});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (needrender)
|
||||||
|
model.trigger('change');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
!hasGroup && this.collection.each(function (model) {
|
!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});
|
color = (user) ? user.get('color') : null,
|
||||||
|
needrender = false;
|
||||||
|
if (color !== model.get('usercolor')) {
|
||||||
|
needrender = true;
|
||||||
|
model.set('usercolor', color, {silent: true});
|
||||||
|
}
|
||||||
|
|
||||||
model.get('replys').forEach(function (reply) {
|
model.get('replys').forEach(function (reply) {
|
||||||
user = users.findOriginalUser(reply.get('userid'));
|
user = users.findOriginalUser(reply.get('userid'));
|
||||||
reply.set('usercolor', (user) ? user.get('color') : null, {silent: true});
|
color = (user) ? user.get('color') : null;
|
||||||
});
|
if (color !== reply.get('usercolor')) {
|
||||||
});
|
needrender = true;
|
||||||
this.view.saveText();
|
reply.set('usercolor', color, {silent: true});
|
||||||
this.updateComments(true, undefined, true);
|
|
||||||
if (this.getPopover().isVisible() && !this.isDummyComment) {
|
|
||||||
var t = this,
|
|
||||||
popover = this.getPopover(),
|
|
||||||
text = '';
|
|
||||||
this.popoverComments.each(function (model) {
|
|
||||||
if (model.get('editTextInPopover')) {
|
|
||||||
text = popover.getEditText();
|
|
||||||
} else if (model.get('showReplyInPopover')) {
|
|
||||||
text = t.popover.getEditText();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
popover.update(true);
|
if (needrender)
|
||||||
if (text.length) {
|
model.trigger('change');
|
||||||
var textBox = popover.commentsView.getTextBox();
|
});
|
||||||
textBox && textBox.val(text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
readSDKComment: function (id, data) {
|
readSDKComment: function (id, data) {
|
||||||
|
|
Loading…
Reference in a new issue