Commit dd1d56b9 authored by JC Brand's avatar JC Brand

Enable users to specify the XMPP server for chatrooms

parent 7a824ac4
......@@ -89,10 +89,6 @@
list-style: none;
}
input.new-chatroom-name {
width: 10em;
}
.chat-blink {
background-color: #176689;
border-right:1px solid #176689;
......@@ -416,7 +412,7 @@ form.search-xmpp-contact input {
}
#available-chatrooms {
height: 225px;
height: 183px;
overflow-y: scroll;
}
......
......@@ -701,7 +701,8 @@
template: _.template(
'<form class="add-chatroom" action="" method="post">'+
'<input type="text" name="chatroom" class="new-chatroom-name" placeholder="Chat room name"/>'+
'<input type="text" name="chatroom" class="new-chatroom-name" placeholder="Room name"/>'+
'<input type="text" name="server" class="new-chatroom-server" placeholder="Server" value="{{server_name}}"/>'+
'<button type="submit">Join</button>'+
'</form>'+
'<dl id="available-chatrooms">'+
......@@ -710,7 +711,8 @@
render: function () {
this.$parent.find('#controlbox-tabs').append(this.tab_template());
this.$parent.find('#controlbox-panes').append(this.$el.html(this.template()).hide());
var server_name = this.muc_domain;
this.$parent.find('#controlbox-panes').append(this.$el.html(this.template({server_name:server_name})).hide());
return this;
},
......@@ -743,16 +745,21 @@
createChatRoom: function (ev) {
ev.preventDefault();
var name, jid, input;
var name, server, jid, $name, $server, errors;
if (ev.type === 'click') {
jid = $(ev.target).attr('data-room-jid');
} else {
input = this.$el.find('input.new-chatroom-name');
name = input.val().trim().toLowerCase();
input.val(''); // Clear the input
if (name) {
jid = Strophe.escapeNode(name) + '@' + this.muc_domain;
$name = this.$el.find('input.new-chatroom-name');
$server= this.$el.find('input.new-chatroom-server');
server = $server.val();
name = $name.val().trim().toLowerCase();
$name.val(''); // Clear the input
if (name && server) {
jid = Strophe.escapeNode(name) + '@' + server;
} else {
errors = true;
if (!name) { $name.addClass('error'); }
if (!server) { $server.addClass('error'); }
return;
}
}
......
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