Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Bugfix: TypeError: o.getAttribute is not a function converse-chatview.js

Browse Source 
can cause messages to not appear.

* Check against null not Element.
* Avoid iterating over non-Element nodes
This commit is contained in:
JC Brand 2019-08-13 19:30:20 +02:00
parent 3faaf6a62b
commit 9c024757b6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -6,6 +6,7 @@
- Reconnect if the server doesn't respond to a `ping` within 10 seconds.
- Don't query for MAM MUC messages before the cached messages have been restored (another cause of duplicate messages).
- Show an error message and option to retry when fetching of the MAM archive times out
- Bugfix: `TypeError: o.getAttribute is not a function converse-chatview.js` (can cause messages to not appear).
## 5.0.0 (2019-08-08)

18
src/utils/html.js
View File

@ -223,7 +223,7 @@ u.calculateElementHeight = function (el) {
u.getNextElement = function (el, selector='*') {
let next_el = el.nextElementSibling;
while ((next_el instanceof Element) && !sizzle.matchesSelector(next_el, selector)) {
while (next_el !== null && !sizzle.matchesSelector(next_el, selector)) {
next_el = next_el.nextElementSibling;
}
return next_el;
@ -231,24 +231,24 @@ u.getNextElement = function (el, selector='*') {
u.getPreviousElement = function (el, selector='*') {
let prev_el = el.previousElementSibling;
while ((prev_el instanceof Element) && !sizzle.matchesSelector(prev_el, selector)) {
prev_el = prev_el.previousSibling
while (prev_el !== null && !sizzle.matchesSelector(prev_el, selector)) {
prev_el = prev_el.previousElementSibling
}
return prev_el;
}
u.getFirstChildElement = function (el, selector='*') {
let first_el = el.firstElementChild;
while ((first_el instanceof Element) && !sizzle.matchesSelector(first_el, selector)) {
first_el = first_el.nextSibling
while (first_el !== null && !sizzle.matchesSelector(first_el, selector)) {
first_el = first_el.nextElementSibling
}
return first_el;
}
u.getLastChildElement = function (el, selector='*') {
let last_el = el.lastElementChild;
while ((last_el instanceof Element) && !sizzle.matchesSelector(last_el, selector)) {
last_el = last_el.previousSibling
while (last_el !== null && !sizzle.matchesSelector(last_el, selector)) {
last_el = last_el.previousElementSibling
}
return last_el;
}
@ -284,7 +284,7 @@ u.hideElement = function (el) {
u.ancestor = function (el, selector) {
let parent = el;
while ((parent instanceof Element) && !sizzle.matchesSelector(parent, selector)) {
while (parent !== null && !sizzle.matchesSelector(parent, selector)) {
parent = parent.parentElement;
}
return parent;
@ -294,7 +294,7 @@ u.nextUntil = function (el, selector, include_self=false) {
/* Return the element's siblings until one matches the selector. */
const matches = [];
let sibling_el = el.nextElementSibling;
while ((sibling_el instanceof Element) && !sibling_el.matches(selector)) {
while (sibling_el !== null && !sibling_el.matches(selector)) {
matches.push(sibling_el);
sibling_el = sibling_el.nextElementSibling;
}