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

Bugfix. Proxy methods to ensure proper context. updates #46

Browse Source
This commit is contained in:
JC Brand 2014-10-12 11:11:28 +02:00
parent 4bcf26114c
commit 60367f82f7
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
converse.js
View File

@ -4627,10 +4627,18 @@
this.registerGlobalEventHandlers();
converse.emit('initialized');
};
var wrappedChatBox = function (chatbox) {
return {
'endOTR': $.proxy(chatbox.endOTR, chatbox),
'get': $.proxy(chatbox.get, chatbox),
'initiateOTR': $.proxy(chatbox.initiateOTR, chatbox),
'maximize': $.proxy(chatbox.maximize, chatbox),
'minimize': $.proxy(chatbox.minimize, chatbox),
'set': $.proxy(chatbox.set, chatbox)
};
};
return {
'initialize': function (settings, callback) {
converse.initialize(settings, callback);
},
'getBuddy': function (jid) {
var contact = converse.roster.get(Strophe.getBareJidFromJid(jid));
if (contact) {
@ -4640,14 +4648,7 @@
'getChatBox': function (jid) {
var chatbox = converse.chatboxes.get(jid);
if (chatbox) {
return {
'endOTR': chatbox.endOTR,
'get': chatbox.get,
'initiateOTR': chatbox.initiateOTR,
'maximize': chatbox.maximize,
'minimize': chatbox.minimize,
'set': chatbox.set
};
return wrappedChatBox(chatbox);
}
},
'getRID': function () {
@ -4662,20 +4663,13 @@
}
return null;
},
'initialize': function (settings, callback) {
converse.initialize(settings, callback);
},
'openChatBox': function (jid) {
var chatbox;
var contact = converse.roster.get(Strophe.getBareJidFromJid(jid));
if (contact) {
chatbox = converse.chatboxviews.showChat(contact.attributes);
return {
'attributes': chatbox.attributes,
'endOTR': chatbox.endOTR,
'get': chatbox.get,
'initiateOTR': chatbox.initiateOTR,
'maximize': chatbox.maximize,
'minimize': chatbox.minimize,
'set': chatbox.set
};
return wrappedChatBox(converse.chatboxviews.showChat(contact.attributes));
}
},
'once': function (evt, handler) {