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

Refactor to no longer call muc.listRooms. updates #307

Browse Source
This commit is contained in:
JC Brand 2015-03-01 13:32:53 +01:00
parent 79a5121219
commit c7d5b8b13f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
converse.js
View File

@ -1790,9 +1790,16 @@
},
updateRoomsList: function () {
converse.connection.muc.listRooms(
this.model.get('muc_domain'),
$.proxy(function (iq) { // Success
/* Send and IQ stanza to the server asking for all rooms
*/
converse.connection.sendIQ(
$iq({
to: this.model.get('muc_domain'),
from: converse.connection.jid,
type: "get"
}).c("query", {xmlns: Strophe.NS.DISCO_ITEMS}),
// Succcess Handler
$.proxy(function (iq) {
var name, jid, i, fragment,
that = this,
$available_chatrooms = this.$el.find('#available-chatrooms');
@ -1821,9 +1828,8 @@
}
return true;
}, this),
$.proxy(function (iq) { // Failure
this.informNoRoomsFound();
}, this));
// Error handler
$.proxy(function (iq) { this.informNoRoomsFound(); }, this));
},
showRooms: function (ev) {

10
spec/controlbox.js
View File

@ -1005,7 +1005,7 @@
expect(_.isEqual(new_attrs.sort(), old_attrs.sort())).toEqual(true);
}
}, converse));
it("will show fullname and jid properties on tooltip", $.proxy(function () {
var jid, name, i, t;
for (i=0; i<mock.cur_names.length; i++) {
@ -1019,7 +1019,7 @@
expect(dd_title).toContain(jid);
}
}, converse));
}, converse));
}, converse, mock, test_utils));
@ -1112,6 +1112,12 @@
expect($('.chatroom:visible').length).toBe(1); // There should now be an open chatroom
}, converse));
}, converse));
it("lists rooms currently on the server", $.proxy(function () {
// TODO: test updateRoomsList
// See: http://xmpp.org/extensions/xep-0045.html#disco-rooms
}, converse));
}, converse));
}, converse, mock, test_utils));
}));