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

Fix failing bookmark tests

Browse Source
This commit is contained in:
JC Brand 2021-01-08 14:36:48 +01:00
parent 9a2678450a
commit 5e6a6ba6ac
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/headless/plugins/bookmarks/collection.js
View File

@ -1,4 +1,5 @@
import "@converse/headless/plugins/muc/index.js"; import "@converse/headless/plugins/muc/index.js";
import Bookmark from './model.js';
import log from "@converse/headless/log.js"; import log from "@converse/headless/log.js";
import { __ } from 'i18n'; import { __ } from 'i18n';
import { _converse, api, converse } from "@converse/headless/core"; import { _converse, api, converse } from "@converse/headless/core";
@ -9,6 +10,7 @@ const u = converse.env.utils;
const Bookmarks = { const Bookmarks = {
model: Bookmark,
comparator: (item) => item.get('name').toLowerCase(), comparator: (item) => item.get('name').toLowerCase(),
initialize () { initialize () {
@ -25,10 +27,6 @@ const Bookmarks = {
this.browserStorage = _converse.createStore(cache_key); this.browserStorage = _converse.createStore(cache_key);
}, },
model (attrs, options) {
return new _converse.Bookmark(attrs, options);
},
async openBookmarkedRoom (bookmark) { async openBookmarkedRoom (bookmark) {
if ( api.settings.get('muc_respect_autojoin') && bookmark.get('autojoin')) { if ( api.settings.get('muc_respect_autojoin') && bookmark.get('autojoin')) {
const groupchat = await api.rooms.create( const groupchat = await api.rooms.create(

2
src/headless/plugins/bookmarks/index.js
View File

@ -102,7 +102,7 @@ converse.plugins.add('converse-bookmarks', {
api.promises.add('bookmarksInitialized'); api.promises.add('bookmarksInitialized');
_converse.Bookmark = Model.extend(Bookmark); _converse.Bookmark = Bookmark;
_converse.Bookmarks = Collection.extend(Bookmarks); _converse.Bookmarks = Collection.extend(Bookmarks);
_converse.BookmarksList = Model.extend({ _converse.BookmarksList = Model.extend({

5
src/headless/plugins/bookmarks/model.js
View File

@ -1,12 +1,13 @@
import { converse } from '@converse/headless/core'; import { converse } from '@converse/headless/core';
import { Model } from '@converse/skeletor/src/model.js';
const { Strophe } = converse.env; const { Strophe } = converse.env;
const Bookmark = { const Bookmark = Model.extend({
idAttribute: 'jid', idAttribute: 'jid',
getDisplayName () { getDisplayName () {
return Strophe.xmlunescape(this.get('name')); return Strophe.xmlunescape(this.get('name'));
} }
}; });
export default Bookmark; export default Bookmark;