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

converse-core: More work on removing jQuery.

Browse Source 
Only $.Deferred is still being used in converse-core.
This commit is contained in:
JC Brand 2017-04-11 09:14:26 +00:00
parent 3d2bfb5c8b
commit d781ebfd37
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/converse-core.js
View File

@ -382,12 +382,17 @@
} }
_converse.idle_seconds = 0; _converse.idle_seconds = 0;
_converse.auto_changed_status = false; // Was the user's status changed by _converse.js? _converse.auto_changed_status = false; // Was the user's status changed by _converse.js?
$(window).on('click mousemove keypress focus'+unloadevent, _converse.onUserActivity); window.addEventListener('click', _converse.onUserActivity);
window.addEventListener('focus', _converse.onUserActivity);
window.addEventListener('keypress', _converse.onUserActivity);
window.addEventListener('mousemove', _converse.onUserActivity);
window.addEventListener(unloadevent, _converse.onUserActivity);
_converse.everySecondTrigger = window.setInterval(_converse.onEverySecond, 1000); _converse.everySecondTrigger = window.setInterval(_converse.onEverySecond, 1000);
}; };
this.giveFeedback = function (subject, klass, message) { this.giveFeedback = function (subject, klass, message) {
$('.conn-feedback').each(function (idx, el) { var els = document.querySelectorAll('.conn-feedback');
_.forEach(els, function (el) {
el.classList.add('conn-feedback'); el.classList.add('conn-feedback');
el.textContent = subject; el.textContent = subject;
if (klass) { if (klass) {
@ -1597,13 +1602,15 @@
* If the #conversejs element doesn't exist, create it. * If the #conversejs element doesn't exist, create it.
*/ */
if (!this.el) { if (!this.el) {
var $el = $('#conversejs'); var el = document.querySelector('#conversejs');
if (!$el.length) { if (_.isNull(el)) {
$el = $('<div id="conversejs">'); el = document.createElement('div');
$('body').append($el); el.setAttribute('id', 'conversejs');
// Converse.js expects a <body> tag to be present.
document.querySelector('body').appendChild(el);
} }
$el.html(''); el.innerHTML = '';
this.setElement($el, false); this.setElement(el, false);
} else { } else {
this.setElement(_.result(this, 'el'), false); this.setElement(_.result(this, 'el'), false);
} }
@ -1796,20 +1803,20 @@
}, },
onInfo: function (stanza) { onInfo: function (stanza) {
var $stanza = $(stanza); if ((sizzle('identity[category=server][type=im]', stanza).length === 0) &&
if (($stanza.find('identity[category=server][type=im]').length === 0) && (sizzle('identity[category=conference][type=text]', stanza).length === 0)) {
($stanza.find('identity[category=conference][type=text]').length === 0)) {
// This isn't an IM server component // This isn't an IM server component
return; return;
} }
$stanza.find('feature').each(function (idx, feature) { var that = this;
_.forEach(stanza.querySelectorAll('feature'), function (feature) {
var namespace = feature.getAttribute('var'); var namespace = feature.getAttribute('var');
this[namespace] = true; that[namespace] = true;
this.create({ that.create({
'var': namespace, 'var': namespace,
'from': stanza.getAttribute('from') 'from': stanza.getAttribute('from')
}); });
}.bind(this)); });
} }
}); });
@ -2014,7 +2021,11 @@
if (this.features) { if (this.features) {
this.features.reset(); this.features.reset();
} }
$(window).off('click mousemove keypress focus'+unloadevent, _converse.onUserActivity); window.removeEventListener('click', _converse.onUserActivity);
window.removeEventListener('focus', _converse.onUserActivity);
window.removeEventListener('keypress', _converse.onUserActivity);
window.removeEventListener('mousemove', _converse.onUserActivity);
window.removeEventListener(unloadevent, _converse.onUserActivity);
window.clearInterval(_converse.everySecondTrigger); window.clearInterval(_converse.everySecondTrigger);
return this; return this;
}; };