Commit c7d5b8b1 authored by JC Brand's avatar JC Brand

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

parent 79a51212
...@@ -1790,9 +1790,16 @@ ...@@ -1790,9 +1790,16 @@
}, },
updateRoomsList: function () { updateRoomsList: function () {
converse.connection.muc.listRooms( /* Send and IQ stanza to the server asking for all rooms
this.model.get('muc_domain'), */
$.proxy(function (iq) { // Success 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, var name, jid, i, fragment,
that = this, that = this,
$available_chatrooms = this.$el.find('#available-chatrooms'); $available_chatrooms = this.$el.find('#available-chatrooms');
...@@ -1821,9 +1828,8 @@ ...@@ -1821,9 +1828,8 @@
} }
return true; return true;
}, this), }, this),
$.proxy(function (iq) { // Failure // Error handler
this.informNoRoomsFound(); $.proxy(function (iq) { this.informNoRoomsFound(); }, this));
}, this));
}, },
showRooms: function (ev) { showRooms: function (ev) {
......
...@@ -1005,7 +1005,7 @@ ...@@ -1005,7 +1005,7 @@
expect(_.isEqual(new_attrs.sort(), old_attrs.sort())).toEqual(true); expect(_.isEqual(new_attrs.sort(), old_attrs.sort())).toEqual(true);
} }
}, converse)); }, converse));
it("will show fullname and jid properties on tooltip", $.proxy(function () { it("will show fullname and jid properties on tooltip", $.proxy(function () {
var jid, name, i, t; var jid, name, i, t;
for (i=0; i<mock.cur_names.length; i++) { for (i=0; i<mock.cur_names.length; i++) {
...@@ -1019,7 +1019,7 @@ ...@@ -1019,7 +1019,7 @@
expect(dd_title).toContain(jid); expect(dd_title).toContain(jid);
} }
}, converse)); }, converse));
}, converse)); }, converse));
}, converse, mock, test_utils)); }, converse, mock, test_utils));
...@@ -1112,6 +1112,12 @@ ...@@ -1112,6 +1112,12 @@
expect($('.chatroom:visible').length).toBe(1); // There should now be an open chatroom expect($('.chatroom:visible').length).toBe(1); // There should now be an open chatroom
}, converse)); }, converse));
}, 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));
}, converse, mock, test_utils)); }, converse, mock, test_utils));
})); }));
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment