Skip to content

C
converse.js
Commit bb6d4f75 authored by JC Brand's avatar JC Brand
Browse files
Options

Fade out enter/leave messages sooner and add check

parent 86a0fa28
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
dist/converse.js
View file @ bb6d4f75
...@@ -69091,8 +69091,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -69091,8 +69091,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
} }
const nick = occupant.get('nick'), const nick = occupant.get('nick'),
stat = occupant.get('status'); stat = occupant.get('status'),
let last_el = this.content.lastElementChild; last_el = this.content.lastElementChild;
if (_.includes(_.get(last_el, 'classList', []), 'chat-info') && _.get(last_el, 'dataset', {}).leave === `"${nick}"`) { if (_.includes(_.get(last_el, 'classList', []), 'chat-info') && _.get(last_el, 'dataset', {}).leave === `"${nick}"`) {
last_el.outerHTML = tpl_info({ last_el.outerHTML = tpl_info({
...@@ -69101,9 +69101,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -69101,9 +69101,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
'extra_classes': 'chat-event', 'extra_classes': 'chat-event',
'message': __('%1$s has left and re-entered the groupchat', nick) 'message': __('%1$s has left and re-entered the groupchat', nick)
}); });
last_el = this.content.lastElementChild; const el = this.content.lastElementChild;
setTimeout(() => u.addClass('fade-out', last_el), 10000); setTimeout(() => u.addClass('fade-out', el), 5000);
setTimeout(() => last_el.parentElement.removeChild(last_el), 11500); setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
} else { } else {
let message; let message;
...@@ -69134,8 +69134,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -69134,8 +69134,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
showLeaveNotification(occupant) { showLeaveNotification(occupant) {
const nick = occupant.get('nick'), const nick = occupant.get('nick'),
stat = occupant.get('status'); stat = occupant.get('status'),
let last_el = this.content.lastElementChild; last_el = this.content.lastElementChild;
if (last_el && _.includes(_.get(last_el, 'classList', []), 'chat-info') && moment(last_el.getAttribute('data-isodate')).isSame(new Date(), "day") && _.get(last_el, 'dataset', {}).join === `"${nick}"`) { if (last_el && _.includes(_.get(last_el, 'classList', []), 'chat-info') && moment(last_el.getAttribute('data-isodate')).isSame(new Date(), "day") && _.get(last_el, 'dataset', {}).join === `"${nick}"`) {
let message; let message;
...@@ -69152,9 +69152,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -69152,9 +69152,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
'extra_classes': 'chat-event', 'extra_classes': 'chat-event',
'message': message 'message': message
}); });
last_el = this.content.lastElementChild; const el = this.content.lastElementChild;
setTimeout(() => u.addClass('fade-out', last_el), 10000); setTimeout(() => u.addClass('fade-out', el), 5000);
setTimeout(() => last_el.parentElement.removeChild(last_el), 11500); setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
} else { } else {
let message; let message;
src/converse-muc-views.js
View file @ bb6d4f75
...@@ -1442,8 +1442,8 @@ ...@@ -1442,8 +1442,8 @@
return; return;
} }
const nick = occupant.get('nick'), const nick = occupant.get('nick'),
stat = occupant.get('status'); stat = occupant.get('status'),
let last_el = this.content.lastElementChild; last_el = this.content.lastElementChild;
if (_.includes(_.get(last_el, 'classList', []), 'chat-info') && if (_.includes(_.get(last_el, 'classList', []), 'chat-info') &&
_.get(last_el, 'dataset', {}).leave === `"${nick}"`) { _.get(last_el, 'dataset', {}).leave === `"${nick}"`) {
...@@ -1455,9 +1455,9 @@ ...@@ -1455,9 +1455,9 @@
'extra_classes': 'chat-event', 'extra_classes': 'chat-event',
'message': __('%1$s has left and re-entered the groupchat', nick) 'message': __('%1$s has left and re-entered the groupchat', nick)
}); });
last_el = this.content.lastElementChild; const el = this.content.lastElementChild;
setTimeout(() => u.addClass('fade-out', last_el), 10000); setTimeout(() => u.addClass('fade-out', el), 5000);
setTimeout(() => last_el.parentElement.removeChild(last_el), 11500); setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
} else { } else {
let message; let message;
if (_.isNil(stat)) { if (_.isNil(stat)) {
...@@ -1486,8 +1486,8 @@ ...@@ -1486,8 +1486,8 @@
showLeaveNotification (occupant) { showLeaveNotification (occupant) {
const nick = occupant.get('nick'), const nick = occupant.get('nick'),
stat = occupant.get('status'); stat = occupant.get('status'),
let last_el = this.content.lastElementChild; last_el = this.content.lastElementChild;
if (last_el && if (last_el &&
_.includes(_.get(last_el, 'classList', []), 'chat-info') && _.includes(_.get(last_el, 'classList', []), 'chat-info') &&
...@@ -1507,9 +1507,9 @@ ...@@ -1507,9 +1507,9 @@
'extra_classes': 'chat-event', 'extra_classes': 'chat-event',
'message': message 'message': message
}); });
last_el = this.content.lastElementChild; const el = this.content.lastElementChild;
setTimeout(() => u.addClass('fade-out', last_el), 10000); setTimeout(() => u.addClass('fade-out', el), 5000);
setTimeout(() => last_el.parentElement.removeChild(last_el), 11500); setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
} else { } else {
let message; let message;
if (_.isNil(stat)) { if (_.isNil(stat)) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7