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

Merge branch 'master' into mockup

Browse Source
This commit is contained in:
JC Brand 2013-08-15 20:47:50 +02:00
commit 72d0f566fc
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
converse.js
View File

@ -697,12 +697,8 @@
}, this), }, this),
$.proxy(function (stanza) { $.proxy(function (stanza) {
console.log("An error occured while fetching vcard"); console.log("An error occured while fetching vcard");
if ($(stanza).find('error').attr('code') == '503') { var jid = $(stanza).attr('from');
// If we get service-unavailable, we continue to create this.addContact(jid, jid);
// the user
var jid = $(stanza).attr('from');
this.addContact(jid, jid);
}
}, this)); }, this));
$('.search-xmpp').hide(); $('.search-xmpp').hide();
}, },
@ -2235,7 +2231,7 @@
this.XMPPStatus = Backbone.Model.extend({ this.XMPPStatus = Backbone.Model.extend({
initialize: function () { initialize: function () {
this.set({ this.set({
'status' : this.get('status') || 'online', 'status' : this.get('status') || 'online'
}); });
this.on('change', $.proxy(function () { this.on('change', $.proxy(function () {
if (this.get('fullname') === undefined) { if (this.get('fullname') === undefined) {

3
index.html
View File

@ -167,7 +167,8 @@
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false, prebind: false,
show_controlbox_by_default: true, show_controlbox_by_default: true,
xhr_user_search: false xhr_user_search: false,
debug: false
}); });
}); });
</script> </script>