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 roster_refactor

Browse Source 
Conflicts:
	converse.js
This commit is contained in:
JC Brand 2015-04-15 22:08:19 +02:00
commit f7a077a911
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
converse.js
View File

@ -154,6 +154,7 @@
Strophe.addNamespace('MUC_ROOMCONF', Strophe.NS.MUC + "#roomconfig"); Strophe.addNamespace('MUC_ROOMCONF', Strophe.NS.MUC + "#roomconfig");
Strophe.addNamespace('MUC_USER', Strophe.NS.MUC + "#user"); Strophe.addNamespace('MUC_USER', Strophe.NS.MUC + "#user");
Strophe.addNamespace('REGISTER', 'jabber:iq:register'); Strophe.addNamespace('REGISTER', 'jabber:iq:register');
Strophe.addNamespace('ROSTERX', 'http://jabber.org/protocol/rosterx');
Strophe.addNamespace('XFORM', 'jabber:x:data'); Strophe.addNamespace('XFORM', 'jabber:x:data');
// Add Strophe Statuses // Add Strophe Statuses
@ -2005,7 +2006,7 @@
converse.features.on('add', this.featureAdded, this); converse.features.on('add', this.featureAdded, this);
// Features could have been added before the controlbox was // Features could have been added before the controlbox was
// initialized. Currently we're only interested in MUC // initialized. Currently we're only interested in MUC
var feature = converse.features.findWhere({'var': 'http://jabber.org/protocol/muc'}); var feature = converse.features.findWhere({'var': Strophe.NS.MUC});
if (feature) { if (feature) {
this.featureAdded(feature); this.featureAdded(feature);
} }
@ -2134,7 +2135,7 @@
}, },
featureAdded: function (feature) { featureAdded: function (feature) {
if ((feature.get('var') == 'http://jabber.org/protocol/muc') && (converse.allow_muc)) { if ((feature.get('var') == Strophe.NS.MUC) && (converse.allow_muc)) {
this.roomspanel.model.save({muc_domain: feature.get('from')}); this.roomspanel.model.save({muc_domain: feature.get('from')});
var $server= this.$el.find('input.new-chatroom-server'); var $server= this.$el.find('input.new-chatroom-server');
if (! $server.is(':focus')) { if (! $server.is(':focus')) {
@ -4445,7 +4446,7 @@
t += $(msg).find('item').length*250; t += $(msg).find('item').length*250;
return true; return true;
}, },
'http://jabber.org/protocol/rosterx', 'message', null Strophe.NS.ROSTERX, 'message', null
); );
}, },
@ -4841,7 +4842,7 @@
* feature-providing Models, not here * feature-providing Models, not here
*/ */
converse.connection.disco.addFeature(Strophe.NS.CHATSTATES); converse.connection.disco.addFeature(Strophe.NS.CHATSTATES);
converse.connection.disco.addFeature('http://jabber.org/protocol/rosterx'); // Limited support converse.connection.disco.addFeature(Strophe.NS.ROSTERX); // Limited support
converse.connection.disco.addFeature('jabber:x:conference'); converse.connection.disco.addFeature('jabber:x:conference');
converse.connection.disco.addFeature('urn:xmpp:carbons:2'); converse.connection.disco.addFeature('urn:xmpp:carbons:2');
converse.connection.disco.addFeature(Strophe.NS.VCARD); converse.connection.disco.addFeature(Strophe.NS.VCARD);