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

Enable users to specify the XMPP server for chatrooms

Browse Source
This commit is contained in:
JC Brand 2013-04-30 07:36:16 +02:00
parent 7a824ac4f4
commit dd1d56b9d8
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
converse.css
View File

@ -89,10 +89,6 @@
list-style: none; list-style: none;
} }
input.new-chatroom-name {
width: 10em;
}
.chat-blink { .chat-blink {
background-color: #176689; background-color: #176689;
border-right:1px solid #176689; border-right:1px solid #176689;
@ -416,7 +412,7 @@ form.search-xmpp-contact input {
} }
#available-chatrooms { #available-chatrooms {
height: 225px; height: 183px;
overflow-y: scroll; overflow-y: scroll;
} }

23
converse.js
View File

@ -701,7 +701,8 @@
template: _.template( template: _.template(
'<form class="add-chatroom" action="" method="post">'+ '<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>'+ '<button type="submit">Join</button>'+
'</form>'+ '</form>'+
'<dl id="available-chatrooms">'+ '<dl id="available-chatrooms">'+
@ -710,7 +711,8 @@
render: function () { render: function () {
this.$parent.find('#controlbox-tabs').append(this.tab_template()); 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; return this;
}, },
@ -743,16 +745,21 @@
createChatRoom: function (ev) { createChatRoom: function (ev) {
ev.preventDefault(); ev.preventDefault();
var name, jid, input; var name, server, jid, $name, $server, errors;
if (ev.type === 'click') { if (ev.type === 'click') {
jid = $(ev.target).attr('data-room-jid'); jid = $(ev.target).attr('data-room-jid');
} else { } else {
input = this.$el.find('input.new-chatroom-name'); $name = this.$el.find('input.new-chatroom-name');
name = input.val().trim().toLowerCase(); $server= this.$el.find('input.new-chatroom-server');
input.val(''); // Clear the input server = $server.val();
if (name) { name = $name.val().trim().toLowerCase();
jid = Strophe.escapeNode(name) + '@' + this.muc_domain; $name.val(''); // Clear the input
if (name && server) {
jid = Strophe.escapeNode(name) + '@' + server;
} else { } else {
errors = true;
if (!name) { $name.addClass('error'); }
if (!server) { $server.addClass('error'); }
return; return;
} }
} }