Commit 73a97bce authored by JC Brand's avatar JC Brand

Some initial work on removing jQuery

parent d6b5ed5e
This diff is collapsed.
...@@ -1786,25 +1786,25 @@ ...@@ -1786,25 +1786,25 @@
this.scrollDown(); this.scrollDown();
}, },
onChatRoomMessage: function (msg) { onChatRoomMessage: function (message) {
/* Given a <message> stanza, create a message /* Given a <message> stanza, create a message
* Backbone.Model if appropriate. * Backbone.Model if appropriate.
* *
* Parameters: * Parameters:
* (XMLElement) msg: The received message stanza * (XMLElement) msg: The received message stanza
*/ */
var $message = $(msg), var original_stanza = message,
$forwarded = $message.find('forwarded'), forwarded = message.querySelector('forwarded'),
$delay; delay;
if ($forwarded.length) { if (!_.isNull(forwarded)) {
$message = $forwarded.children('message'); message = forwarded.querySelector('message');
$delay = $forwarded.children('delay'); delay = forwarded.querySelector('delay');
} }
var jid = msg.getAttribute('from'), var jid = message.getAttribute('from'),
msgid = msg.getAttribute('id'), msgid = message.getAttribute('id'),
resource = Strophe.getResourceFromJid(jid), resource = Strophe.getResourceFromJid(jid),
sender = resource && Strophe.unescapeNode(resource) || '', sender = resource && Strophe.unescapeNode(resource) || '',
subject = $message.children('subject').text(), subject = _.propertyOf(message.querySelector('subject'))('textContent'),
dupes = msgid && this.model.messages.filter(function (msg) { dupes = msgid && this.model.messages.filter(function (msg) {
// Find duplicates. // Find duplicates.
// Some bots (like HAL in the prosody chatroom) // Some bots (like HAL in the prosody chatroom)
...@@ -1821,7 +1821,7 @@ ...@@ -1821,7 +1821,7 @@
if (sender === '') { if (sender === '') {
return true; return true;
} }
this.model.createMessage($message, $delay, msg); this.model.createMessage(message, delay, original_stanza);
if (sender !== this.model.get('nick')) { if (sender !== this.model.get('nick')) {
// We only emit an event if it's not our own message // We only emit an event if it's not our own message
converse.emit('message', msg); converse.emit('message', msg);
......
...@@ -108,10 +108,9 @@ ...@@ -108,10 +108,9 @@
!(utils.isOTRMessage($message[0]) && !_.contains([UNVERIFIED, VERIFIED], this.get('otr_status'))); !(utils.isOTRMessage($message[0]) && !_.contains([UNVERIFIED, VERIFIED], this.get('otr_status')));
}, },
createMessage: function ($message, $delay, original_stanza) { createMessage: function (message, delay, original_stanza) {
var converse = this.__super__.converse, var converse = this.__super__.converse,
$body = $message.children('body'), text = _.propertyOf(message.querySelector('body'))('textContent');
text = ($body.length > 0 ? $body.text() : undefined);
if ((!text) || (!converse.allow_otr)) { if ((!text) || (!converse.allow_otr)) {
return this.__super__.createMessage.apply(this, arguments); return this.__super__.createMessage.apply(this, arguments);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment