From 6a12a96e85277e2571f8f114d8ad845c45f8b895 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Wed, 28 Mar 2018 13:00:46 +0200 Subject: [PATCH] Fixes #1043 Parsing of bookmarks fail with missing nick element. --- spec/bookmarks.js | 2 +- src/converse-bookmarks.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/bookmarks.js b/spec/bookmarks.js index cfdb9024b..afdd72072 100644 --- a/spec/bookmarks.js +++ b/spec/bookmarks.js @@ -444,7 +444,7 @@ 'name': 'Another room', 'autojoin': 'false', 'jid': 'another@conference.shakespeare.lit' - }).c('nick').t('JC').up().up(); + }); // Purposefully exclude the element to test #1043 _converse.connection._dataRecv(test_utils.createRequest(stanza)); expect(_converse.bookmarks.models.length).toBe(2); expect(_converse.bookmarks.findWhere({'jid': 'theplay@conference.shakespeare.lit'}).get('autojoin')).toBe(true); diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js index 0a90f9494..dd08f1ce2 100644 --- a/src/converse-bookmarks.js +++ b/src/converse-bookmarks.js @@ -382,7 +382,7 @@ 'jid': bookmark.getAttribute('jid'), 'name': bookmark.getAttribute('name'), 'autojoin': bookmark.getAttribute('autojoin') === 'true', - 'nick': bookmark.querySelector('nick').textContent + 'nick': _.get(bookmark.querySelector('nick'), 'textContent') }); }); },