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

Bugfix. Contact's name got replaced with JID. updates #58

Browse Source
This commit is contained in:
JC Brand 2013-11-11 21:56:11 +02:00
parent e8af60e12b
commit 0369f11dc5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES.rst
View File

@ -9,11 +9,19 @@ Changelog
HTML needed in your webpage for converse.js to work has been reduced to a HTML needed in your webpage for converse.js to work has been reduced to a
single div: <div id="conversejs"></div> single div: <div id="conversejs"></div>
Features:
~~~~~~~~~
* Add a toolbar for single user chat [jcbrand] * Add a toolbar for single user chat [jcbrand]
* Add support for OTR (off-the-record) encryption [jcbrand] * Add support for OTR (off-the-record) encryption [jcbrand]
* Add support for smileys [jcbrand] * Add support for smileys [jcbrand]
* Simplified boilerplate markup [jcbrand] * Simplified boilerplate markup [jcbrand]
* New configuration settings, ``xhr_custom_status_url`` and ``xhr_user_search_url`` [jcbrand] * New configuration settings, ``xhr_custom_status_url`` and ``xhr_user_search_url`` [jcbrand]
Bugfixes:
~~~~~~~~~
* #58 Contact's name gets replaced with their JID [jcbrand]
* #81 Requesting contacts appear as pending contacts [jcbrand] * #81 Requesting contacts appear as pending contacts [jcbrand]
0.6.6 (2013-10-16) 0.6.6 (2013-10-16)

5
converse.js
View File

@ -190,7 +190,7 @@
converse.connection.vcard.get( converse.connection.vcard.get(
$.proxy(function (iq) { $.proxy(function (iq) {
// Successful callback // Successful callback
$vcard = $(iq).find('vCard'); var $vcard = $(iq).find('vCard');
var fullname = $vcard.find('FN').text(), var fullname = $vcard.find('FN').text(),
img = $vcard.find('BINVAL').text(), img = $vcard.find('BINVAL').text(),
img_type = $vcard.find('TYPE').text(), img_type = $vcard.find('TYPE').text(),
@ -198,8 +198,9 @@
if (jid) { if (jid) {
var rosteritem = converse.roster.get(jid); var rosteritem = converse.roster.get(jid);
if (rosteritem) { if (rosteritem) {
fullname = _.isEmpty(fullname)? rosteritem.get('fullname') || jid: fullname;
rosteritem.save({ rosteritem.save({
'fullname': fullname || jid, 'fullname': fullname,
'image_type': img_type, 'image_type': img_type,
'image': img, 'image': img,
'url': url, 'url': url,