Commit 08c016da authored by JC Brand's avatar JC Brand

Get ancestor element via selector

parent 658c2773
...@@ -2756,7 +2756,7 @@ ...@@ -2756,7 +2756,7 @@
toggleRoomInfo (ev) { toggleRoomInfo (ev) {
/* Show/hide extra information about a room in the listing. /* Show/hide extra information about a room in the listing.
*/ */
const parent_el = ev.target.parentElement.parentElement, const parent_el = u.ancestor(ev.target, '.room-item'),
div_el = parent_el.querySelector('div.room-info'); div_el = parent_el.querySelector('div.room-info');
if (div_el) { if (div_el) {
u.slideIn(div_el).then(u.removeElement) u.slideIn(div_el).then(u.removeElement)
......
<div> <div class="room-item">
<div class="available-chatroom d-flex flex-row {[ if (o.hidden) { ]} hidden {[ } ]}" data-room-jid="{{{o.jid}}}"> <div class="available-chatroom d-flex flex-row {[ if (o.hidden) { ]} hidden {[ } ]}" data-room-jid="{{{o.jid}}}">
<a class="open-room w-100" data-room-jid="{{{o.jid}}}" title="{{{o.open_title}}}" href="#">{{{o.name}}}</a> <a class="open-room w-100" data-room-jid="{{{o.jid}}}" title="{{{o.open_title}}}" href="#">{{{o.name}}}</a>
<a class="remove-bookmark fa fa-bookmark align-self-center {[ if (o.bookmarked) { ]} button-on {[ } ]}" <a class="remove-bookmark fa fa-bookmark align-self-center {[ if (o.bookmarked) { ]} button-on {[ } ]}"
......
<div> <div class="room-item">
<div class="available-chatroom d-flex flex-row"> <div class="available-chatroom d-flex flex-row">
<a class="open-room available-room" <a class="open-room available-room"
data-room-jid="{{{o.jid}}}" data-room-jid="{{{o.jid}}}"
......
<div> <div class="room-item">
<div class="available-chatroom d-flex flex-row {[ if (o.num_unread_general) { ]} unread-msgs {[ } ]}" data-room-jid="{{{o.jid}}}"> <div class="available-chatroom d-flex flex-row {[ if (o.num_unread_general) { ]} unread-msgs {[ } ]}" data-room-jid="{{{o.jid}}}">
{[ if (o.num_unread) { ]} {[ if (o.num_unread) { ]}
<span class="msgs-indicator">{{{ o.num_unread }}}</span> <span class="msgs-indicator">{{{ o.num_unread }}}</span>
......
...@@ -148,6 +148,14 @@ ...@@ -148,6 +148,14 @@
return el; return el;
} }
u.ancestor = function (el, selector) {
let parent = el;
while (!_.isNil(parent) && !sizzle.matchesSelector(parent, selector)) {
parent = parent.parentElement;
}
return parent;
}
u.nextUntil = function (el, selector, include_self=false) { u.nextUntil = function (el, selector, include_self=false) {
/* Return the element's siblings until one matches the selector. */ /* Return the element's siblings until one matches the selector. */
const matches = []; const matches = [];
......
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