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

Merge pull request #468 from 1st8/master

Browse Source 
Fix [object Object] being sometimes shown as status
This commit is contained in:
JC Brand 2015-09-09 14:16:05 +02:00
commit 64878ec6e0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
converse.js
View File

@ -4457,7 +4457,7 @@
if ((converse.connection.jid !== jid)&&(presence_type !== 'unavailable')) { if ((converse.connection.jid !== jid)&&(presence_type !== 'unavailable')) {
// Another resource has changed its status, we'll update ours as well. // Another resource has changed its status, we'll update ours as well.
converse.xmppstatus.save({'status': chat_status}); converse.xmppstatus.save({'status': chat_status});
if (status_message.length) { converse.xmppstatus.save({'status_message': status_message}); } if (status_message.length) { converse.xmppstatus.save({'status_message': status_message.text()}); }
} }
return; return;
} else if (($presence.find('x').attr('xmlns') || '').indexOf(Strophe.NS.MUC) === 0) { } else if (($presence.find('x').attr('xmlns') || '').indexOf(Strophe.NS.MUC) === 0) {

1
docs/CHANGES.rst
View File

@ -5,6 +5,7 @@ Changelog
------------------ ------------------
* #462 Fix MUC rooms with names containing special characters not working [1st8] * #462 Fix MUC rooms with names containing special characters not working [1st8]
* #468 Fix [object Object] being sometimes shown as status [1st8]
0.9.5 (2015-08-24) 0.9.5 (2015-08-24)
------------------ ------------------