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

Some work on removing jquery from converse-bookmarks

Browse Source
This commit is contained in:
JC Brand 2017-08-14 22:06:32 +02:00
parent 1c80fa41c8
commit 6c3aa34c23
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/bookmarks.js
View File

@ -81,7 +81,8 @@
$form.find('input[name="name"]').val('Play's the Thing');
$form.find('input[name="autojoin"]').prop('checked', true);
$form.find('input[name="nick"]').val('JC');
$form.submit();
view.$el.find('.button-primary').click();
expect(view.model.get('bookmarked')).toBeTruthy();
expect($bookmark.hasClass('on-button'), true);

36
src/converse-bookmarks.js
View File

@ -101,10 +101,11 @@
},
onBookmarked () {
const icon = this.el.querySelector('.icon-pushpin');
if (this.model.get('bookmarked')) {
this.$('.icon-pushpin').addClass('button-on');
icon.classList.add('button-on');
} else {
this.$('.icon-pushpin').removeClass('button-on');
icon.classList.remove('button-on');
}
},
@ -125,11 +126,18 @@
renderBookmarkForm () {
const { _converse } = this.__super__,
{ __ } = _converse,
$body = this.$('.chatroom-body');
$body.children().addClass('hidden');
body = this.el.querySelector('.chatroom-body');
_.each(body.children, function (child) {
child.classList.add('hidden');
});
// Remove any existing forms
$body.find('form.chatroom-form').remove();
$body.append(
let form = body.querySelector('form.chatroom-form');
if (!_.isNull(form)) {
form.parentNode.removeChild(form);
}
body.insertAdjacentHTML(
'beforeend',
tpl_chatroom_bookmark_form({
heading: __('Bookmark this room'),
label_name: __('The name for this bookmark:'),
@ -138,9 +146,17 @@
default_nick: this.model.get('nick'),
label_submit: __('Save'),
label_cancel: __('Cancel')
}));
this.$('.chatroom-form').submit(this.onBookmarkFormSubmitted.bind(this));
this.$('.chatroom-form .button-cancel').on('click', this.cancelConfiguration.bind(this));
})
);
form = body.querySelector('form.chatroom-form');
form.addEventListener(
'submit',
this.onBookmarkFormSubmitted.bind(this)
);
form.querySelector('.button-cancel').addEventListener(
'click',
this.cancelConfiguration.bind(this)
);
},
onBookmarkFormSubmitted (ev) {
@ -173,7 +189,7 @@
_.forEach(models, function (model) {
model.destroy();
});
this.$('.icon-pushpin').removeClass('button-on');
this.el.querySelector('.icon-pushpin').classList.remove('button-on');
}
}
}

2
src/converse-inverse.js
View File

@ -1,7 +1,7 @@
// Converse.js (A browser based XMPP chat client)
// http://conversejs.org
//
// Copyright (c) 2012-2016, Jan-Carel Brand <jc@opkode.com>
// Copyright (c) JC Brand <jc@opkode.com>
// Licensed under the Mozilla Public License (MPLv2)
//
/*global define */