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

Show the invitation reason if it exists. updates #215

Browse Source 
Also, call the directInvite method on the XmppRoom obj of Strophe.MUC. This
will automatically include the room name and password.
This commit is contained in:
JC Brand 2014-08-31 01:17:52 +02:00
parent b158c328dd
commit 59505c0c48
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
converse.js
View File

@ -2034,10 +2034,9 @@
); );
if (result === true) { if (result === true) {
var reason = prompt(__("You may optionally include a message, explaining the reason for the invitation.")); var reason = prompt(__("You may optionally include a message, explaining the reason for the invitation."));
// TODO: add support for including password for protected rooms. converse.connection.muc.rooms[this.model.get('id')].directInvite(suggestion.jid, reason);
converse.connection.muc.directInvite(this.model.get('id'), suggestion.jid, reason);
} }
$(ev.target).val(''); $(ev.target).typeahead('val', '');
}, this)); }, this));
return this; return this;
}, },
@ -2540,25 +2539,25 @@
contact = converse.roster.get(from), contact = converse.roster.get(from),
result; result;
if (reason) { if (!reason) {
result = confirm( result = confirm(
___("%1$s has invited you to join a chat room: %2$s", contact.get('fullname'), room_jid) __(___("%1$s has invited you to join a chat room: %2$s"), contact.get('fullname'), room_jid)
); );
} else { } else {
result = confirm( result = confirm(
___('%1$s has invited you to join a chat room: %2$s, and left the following reason: "%2$s"', __(___('%1$s has invited you to join a chat room: %2$s, and left the following reason: "%3$s"'),
contact.get('fullname'), room_jid, reason) contact.get('fullname'), room_jid, reason)
); );
} }
if (result === true) { if (result === true) {
// TODO: Give user option to choose nickname?
var chatroom = converse.chatboxviews.showChat({ var chatroom = converse.chatboxviews.showChat({
'id': room_jid, 'id': room_jid,
'jid': room_jid, 'jid': room_jid,
'name': Strophe.unescapeNode(Strophe.getNodeFromJid(room_jid)), 'name': Strophe.unescapeNode(Strophe.getNodeFromJid(room_jid)),
'nick': Strophe.unescapeNode(Strophe.getNodeFromJid(converse.connection.jid)), 'nick': Strophe.unescapeNode(Strophe.getNodeFromJid(converse.connection.jid)),
'chatroom': true, 'chatroom': true,
'box_id' : b64_sha1(room_jid) 'box_id' : b64_sha1(room_jid),
'password': $x.attr('password')
}); });
if (!chatroom.get('connected')) { if (!chatroom.get('connected')) {
converse.chatboxviews.get(jid).connect(null); converse.chatboxviews.get(jid).connect(null);
@ -2729,6 +2728,9 @@
}, },
showChat: function (attrs) { showChat: function (attrs) {
/* Find the chat box and show it.
* If it doesn't exist, create it.
*/
var chatbox = this.model.get(attrs.jid); var chatbox = this.model.get(attrs.jid);
if (chatbox) { if (chatbox) {
if (chatbox.get('minimized')) { if (chatbox.get('minimized')) {