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

Don't automatically show a chat box when creating it. updates #357

Browse Source 
This caused a bug whereby a chat box would open only on chat state
notifications.

Also refactored the chats.open and chats.get methods so that they now reuse the
same map function and so that chats.get can now return any chat box and not
just already open ones.

Updated the tests to properly test this and updated the docs.
This commit is contained in:
JC Brand 2015-04-02 02:01:53 +02:00
parent a902ba2d8a
commit 5ec7c67b50
5 changed files with 123 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
converse.js
View File

@ -1016,12 +1016,7 @@
this.updateVCard(); this.updateVCard();
this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el); this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el);
this.render().model.messages.fetch({add: true}); this.hide().render().model.messages.fetch({add: true});
if (this.model.get('minimized')) {
this.hide();
} else {
this.show();
}
if ((_.contains([UNVERIFIED, VERIFIED], this.model.get('otr_status'))) || converse.use_otr_by_default) { if ((_.contains([UNVERIFIED, VERIFIED], this.model.get('otr_status'))) || converse.use_otr_by_default) {
this.model.initiateOTR(); this.model.initiateOTR();
} }
@ -1159,7 +1154,10 @@
if ((message.get('sender') != 'me') && (converse.windowState == 'blur')) { if ((message.get('sender') != 'me') && (converse.windowState == 'blur')) {
converse.incrementMsgCounter(); converse.incrementMsgCounter();
} }
return this.scrollDown(); this.scrollDown();
if (!this.model.get('minimized') && !this.$el.is(':visible')) {
this.show();
}
}, },
sendMessageStanza: function (text) { sendMessageStanza: function (text) {
@ -1617,7 +1615,7 @@
this.initDragResize(); this.initDragResize();
} }
this.setChatState(ACTIVE); this.setChatState(ACTIVE);
return this; return this.focus();
}, },
scrollDown: function () { scrollDown: function () {
@ -3075,6 +3073,8 @@
}, },
onMessage: function (message) { onMessage: function (message) {
/* Handler method for all incoming single-user chat "message" stanzas.
*/
var $message = $(message); var $message = $(message);
var contact_jid, $forwarded, $received, $sent, var contact_jid, $forwarded, $received, $sent,
msgid = $message.attr('id'), msgid = $message.attr('id'),
@ -3280,7 +3280,6 @@
showChat: function (attrs) { showChat: function (attrs) {
/* Find the chat box and show it. If it doesn't exist, create it. /* Find the chat box and show it. If it doesn't exist, create it.
*/ */
// TODO: Send the chat state ACTIVE to the contact once the chat box is opened.
var chatbox = this.model.get(attrs.jid); var chatbox = this.model.get(attrs.jid);
if (!chatbox) { if (!chatbox) {
chatbox = this.model.create(attrs, { chatbox = this.model.create(attrs, {
@ -5432,6 +5431,7 @@
var wrappedChatBox = function (chatbox) { var wrappedChatBox = function (chatbox) {
var view = converse.chatboxviews.get(chatbox.get('jid')); var view = converse.chatboxviews.get(chatbox.get('jid'));
return { return {
'open': $.proxy(view.show, view),
'close': $.proxy(view.close, view), 'close': $.proxy(view.close, view),
'endOTR': $.proxy(chatbox.endOTR, chatbox), 'endOTR': $.proxy(chatbox.endOTR, chatbox),
'focus': $.proxy(view.focus, view), 'focus': $.proxy(view.focus, view),
@ -5442,6 +5442,27 @@
'set': $.proxy(chatbox.set, chatbox) 'set': $.proxy(chatbox.set, chatbox)
}; };
}; };
var getWrappedChatBox = function (jid) {
var chatbox = converse.chatboxes.get(jid);
if (!chatbox) {
var roster_item = converse.roster.get(jid);
if (roster_item === undefined) {
converse.log('Could not get roster item for JID '+jid, 'error');
return null;
}
chatbox = converse.chatboxes.create({
'id': jid,
'jid': jid,
'fullname': _.isEmpty(roster_item.get('fullname'))? jid: roster_item.get('fullname'),
'image_type': roster_item.get('image_type'),
'image': roster_item.get('image'),
'url': roster_item.get('url')
});
}
return wrappedChatBox(chatbox);
};
return { return {
'initialize': function (settings, callback) { 'initialize': function (settings, callback) {
converse.initialize(settings, callback); converse.initialize(settings, callback);
@ -5498,47 +5519,29 @@
}, },
'chats': { 'chats': {
'open': function (jids) { 'open': function (jids) {
var _transform = function (jid) { var chatbox;
var chatbox = converse.chatboxes.get(jid);
if (!chatbox) {
var roster_item = converse.roster.get(jid);
if (roster_item === undefined) {
converse.log('Could not get roster item for JID '+jid, 'error');
return null;
}
chatbox = converse.chatboxes.create({
'id': jid,
'jid': jid,
'fullname': _.isEmpty(roster_item.get('fullname'))? jid: roster_item.get('fullname'),
'image_type': roster_item.get('image_type'),
'image': roster_item.get('image'),
'url': roster_item.get('url')
});
}
return wrappedChatBox(chatbox);
};
if (typeof jids === "undefined") { if (typeof jids === "undefined") {
converse.log("chats.open: You need to provide at least one JID", "error"); converse.log("chats.open: You need to provide at least one JID", "error");
return null; return null;
} else if (typeof jids === "string") { } else if (typeof jids === "string") {
return _transform(jids); chatbox = getWrappedChatBox(jids);
chatbox.open();
return chatbox;
} }
return _.map(jids, _transform); return _.map(jids, function (jid) {
var chatbox = getWrappedChatBox(jid);
chatbox.open();
return chatbox;
});
}, },
'get': function (jids) { 'get': function (jids) {
var _transform = function (jid) {
var chatbox = converse.chatboxes.get(jid);
if (!chatbox) {
return null;
}
return wrappedChatBox(chatbox);
};
if (typeof jids === "undefined") { if (typeof jids === "undefined") {
jids = converse.roster.pluck('jid'); converse.log("chats.get: You need to provide at least one JID", "error");
return null;
} else if (typeof jids === "string") { } else if (typeof jids === "string") {
return _transform(jids); return getWrappedChatBox(jids);
} }
return _.filter(_.map(jids, _transform), function (i) {return i !== null;}); return _.map(jids, getWrappedChatBox);
} }
}, },
'tokens': { 'tokens': {

4
docs/CHANGES.rst
View File

@ -5,7 +5,11 @@ Changelog
----------------- -----------------
* Bugfix. Prevent attaching twice during initialization. [jcbrand] * Bugfix. Prevent attaching twice during initialization. [jcbrand]
* API method chats.get can now also return chat boxes which haven't been opened yet. [jcbrand]
* Add API method contacts.add. [pzia] * Add API method contacts.add. [pzia]
* #356 Fix the plugin extend function. [floriancargoet]
* #357 Fix the known bug where a state notification reopens a chat box. [floriancargoet]
* #358 Bugfix. Chat rooms show the same occupants bug. [floriancargoet]
0.9.1 (2015-03-26) 0.9.1 (2015-03-26)
------------------ ------------------

10
docs/source/development.rst
View File

@ -41,9 +41,8 @@ directory:
make dev make dev
On Windows you need to specify Makefile.win to be used by running: On Windows you need to specify Makefile.win to be used by running: ::
::
make -f Makefile.win dev make -f Makefile.win dev
Or alternatively, if you don't have GNU Make: Or alternatively, if you don't have GNU Make:
@ -291,8 +290,7 @@ You may also provide the fullname. If not present, we use the jid as fullname.
get get
~~~ ~~~
Returns an object representing a chat box, if that chat box is already open. Returns an object representing a chat box.
If the chat box is not already open, this method will return ``null``.
To return a single chat box, provide the JID of the contact you're chatting To return a single chat box, provide the JID of the contact you're chatting
with in that chat box:: with in that chat box::
@ -321,7 +319,7 @@ To return an array of chat boxes, provide an array of JIDs::
converse.chats.open(['buddy1@example.com', 'buddy2@example.com']) converse.chats.open(['buddy1@example.com', 'buddy2@example.com'])
*The returned chat box contains the following methods:* *The returned chat box object contains the following methods:*
+-------------+------------------------------------------+ +-------------+------------------------------------------+
| Method | Description | | Method | Description |
@ -340,6 +338,8 @@ To return an array of chat boxes, provide an array of JIDs::
+-------------+------------------------------------------+ +-------------+------------------------------------------+
| close | Close the chat box. | | close | Close the chat box. |
+-------------+------------------------------------------+ +-------------+------------------------------------------+
| open | Opens the chat box. |
+-------------+------------------------------------------+
*The get and set methods can be used to retrieve and change the following attributes:* *The get and set methods can be used to retrieve and change the following attributes:*

133
spec/chatbox.js
View File

@ -431,7 +431,7 @@
this.chatboxes.onMessage(msg); this.chatboxes.onMessage(msg);
expect(converse.emit).toHaveBeenCalledWith('message', msg); expect(converse.emit).toHaveBeenCalledWith('message', msg);
}, converse)); }, converse));
waits(250); waits(50);
runs($.proxy(function () { runs($.proxy(function () {
// Check that the chatbox and its view now exist // Check that the chatbox and its view now exist
var chatbox = this.chatboxes.get(sender_jid); var chatbox = this.chatboxes.get(sender_jid);
@ -462,61 +462,46 @@
var contact_name = mock.cur_names[0]; var contact_name = mock.cur_names[0];
var contact_jid = contact_name.replace(/ /g,'.').toLowerCase() + '@localhost'; var contact_jid = contact_name.replace(/ /g,'.').toLowerCase() + '@localhost';
spyOn(this, 'emit'); spyOn(this, 'emit');
runs(function () { test_utils.openChatBoxFor(contact_jid);
test_utils.openChatBoxFor(contact_jid); var chatview = this.chatboxviews.get(contact_jid);
var chatview = converse.chatboxviews.get(contact_jid); expect(chatview.$el.is(':visible')).toBeTruthy();
expect(chatview.model.get('minimized')).toBeFalsy(); expect(chatview.model.get('minimized')).toBeFalsy();
chatview.$el.find('.toggle-chatbox-button').click(); chatview.$el.find('.toggle-chatbox-button').click();
}); expect(chatview.model.get('minimized')).toBeTruthy();
waits(50); var message = 'This message is sent to a minimized chatbox';
runs($.proxy(function () { var sender_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost';
var chatview = this.chatboxviews.get(contact_jid); msg = $msg({
expect(chatview.model.get('minimized')).toBeTruthy(); from: sender_jid,
var message = 'This message is sent to a minimized chatbox'; to: this.connection.jid,
var sender_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost'; type: 'chat',
msg = $msg({ id: (new Date()).getTime()
from: sender_jid, }).c('body').t(message).up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
this.chatboxes.onMessage(msg);
expect(this.emit).toHaveBeenCalledWith('message', msg);
var trimmed_chatboxes = this.minimized_chats;
var trimmedview = trimmed_chatboxes.get(contact_jid);
var $count = trimmedview.$el.find('.chat-head-message-count');
expect(chatview.$el.is(':visible')).toBeFalsy();
expect(trimmedview.model.get('minimized')).toBeTruthy();
expect($count.is(':visible')).toBeTruthy();
expect($count.html()).toBe('1');
this.chatboxes.onMessage(
$msg({
from: mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost',
to: this.connection.jid, to: this.connection.jid,
type: 'chat', type: 'chat',
id: (new Date()).getTime() id: (new Date()).getTime()
}).c('body').t(message).up() }).c('body').t('This message is also sent to a minimized chatbox').up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree(); .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree()
this.chatboxes.onMessage(msg); );
expect(this.emit).toHaveBeenCalledWith('message', msg); expect(chatview.$el.is(':visible')).toBeFalsy();
}, converse)); expect(trimmedview.model.get('minimized')).toBeTruthy();
waits(50); $count = trimmedview.$el.find('.chat-head-message-count');
runs($.proxy(function () { expect($count.is(':visible')).toBeTruthy();
var trimmed_chatboxes = this.minimized_chats; expect($count.html()).toBe('2');
var trimmedview = trimmed_chatboxes.get(contact_jid); trimmedview.$el.find('.restore-chat').click();
var $count = trimmedview.$el.find('.chat-head-message-count'); expect(trimmed_chatboxes.keys().length).toBe(0);
expect(trimmedview.model.get('minimized')).toBeTruthy();
expect($count.is(':visible')).toBeTruthy();
expect($count.html()).toBe('1');
this.chatboxes.onMessage(
$msg({
from: mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost',
to: this.connection.jid,
type: 'chat',
id: (new Date()).getTime()
}).c('body').t('This message is also sent to a minimized chatbox').up()
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree()
);
}, converse));
waits(50);
runs($.proxy(function () {
var trimmed_chatboxes = this.minimized_chats;
var trimmedview = trimmed_chatboxes.get(contact_jid);
var $count = trimmedview.$el.find('.chat-head-message-count');
expect(trimmedview.model.get('minimized')).toBeTruthy();
expect($count.is(':visible')).toBeTruthy();
expect($count.html()).toBe('2');
trimmedview.$el.find('.restore-chat').click();
}, converse));
waits(250);
runs($.proxy(function () {
var trimmed_chatboxes = this.minimized_chats;
expect(trimmed_chatboxes.keys().length).toBe(0);
}, converse));
}, converse)); }, converse));
it("will indicate when it has a time difference of more than a day between it and its predecessor", $.proxy(function () { it("will indicate when it has a time difference of more than a day between it and its predecessor", $.proxy(function () {
@ -591,21 +576,16 @@
it("can be sent from a chatbox, and will appear inside it", $.proxy(function () { it("can be sent from a chatbox, and will appear inside it", $.proxy(function () {
spyOn(converse, 'emit'); spyOn(converse, 'emit');
var contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost'; var contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost';
runs(function () { test_utils.openChatBoxFor(contact_jid);
test_utils.openChatBoxFor(contact_jid); expect(converse.emit).toHaveBeenCalledWith('chatBoxFocused', jasmine.any(Object));
}); var view = this.chatboxviews.get(contact_jid);
waits(250); var message = 'This message is sent from this chatbox';
runs(function () { spyOn(view, 'sendMessage').andCallThrough();
expect(converse.emit).toHaveBeenCalledWith('chatBoxFocused', jasmine.any(Object)); test_utils.sendMessage(view, message);
var view = this.chatboxviews.get(contact_jid); expect(view.sendMessage).toHaveBeenCalled();
var message = 'This message is sent from this chatbox'; expect(view.model.messages.length, 2);
spyOn(view, 'sendMessage').andCallThrough(); expect(converse.emit.mostRecentCall.args, ['messageSend', message]);
test_utils.sendMessage(view, message); expect(view.$el.find('.chat-content').find('.chat-message').last().find('.chat-message-content').text()).toEqual(message);
expect(view.sendMessage).toHaveBeenCalled();
expect(view.model.messages.length, 2);
expect(converse.emit.mostRecentCall.args, ['messageSend', message]);
expect(view.$el.find('.chat-content').find('.chat-message').last().find('.chat-message-content').text()).toEqual(message);
}.bind(converse));
}, converse)); }, converse));
it("is sanitized to prevent Javascript injection attacks", $.proxy(function () { it("is sanitized to prevent Javascript injection attacks", $.proxy(function () {
@ -697,6 +677,23 @@
describe("A Chat Status Notification", $.proxy(function () { describe("A Chat Status Notification", $.proxy(function () {
it("does not open automatically if a chat state notification is received", $.proxy(function () {
spyOn(converse, 'emit');
var sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@localhost';
// <composing> state
var msg = $msg({
from: sender_jid,
to: this.connection.jid,
type: 'chat',
id: (new Date()).getTime()
}).c('body').c('composing', {'xmlns': Strophe.NS.CHATSTATES}).tree();
this.chatboxes.onMessage(msg);
expect(converse.emit).toHaveBeenCalledWith('message', msg);
var chatboxview = this.chatboxviews.get(sender_jid);
expect(chatboxview).toBeDefined();
expect(chatboxview.$el.is(':visible')).toBeFalsy(); // The chat box is not visible
}, converse));
describe("An active notification", $.proxy(function () { describe("An active notification", $.proxy(function () {
it("is sent when the user opens a chat box", $.proxy(function () { it("is sent when the user opens a chat box", $.proxy(function () {
spyOn(converse.connection, 'send'); spyOn(converse.connection, 'send');

8
spec/converse.js
View File

@ -137,21 +137,23 @@
test_utils.createContacts('current'); test_utils.createContacts('current');
}, converse)); }, converse));
it("has a method 'get' which returns a wrapped chat box if it's already open", $.proxy(function () { it("has a method 'get' which returns a wrapped chat box", $.proxy(function () {
// Test on chat that doesn't exist. // Test on chat that doesn't exist.
expect(converse_api.chats.get('non-existing@jabber.org')).toBeFalsy(); expect(converse_api.chats.get('non-existing@jabber.org')).toBeFalsy();
// Test on chat that's not open // Test on chat that's not open
var jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost'; var jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost';
var box = converse_api.chats.get(jid); var box = converse_api.chats.get(jid);
expect(box).toBe(null); expect(box instanceof Object).toBeTruthy();
var chatboxview = this.chatboxviews.get(jid);
expect(chatboxview.$el.is(':visible')).toBeFalsy();
// Test for single JID // Test for single JID
test_utils.openChatBoxFor(jid); test_utils.openChatBoxFor(jid);
box = converse_api.chats.get(jid); box = converse_api.chats.get(jid);
expect(box instanceof Object).toBeTruthy(); expect(box instanceof Object).toBeTruthy();
expect(box.get('box_id')).toBe(b64_sha1(jid)); expect(box.get('box_id')).toBe(b64_sha1(jid));
var chatboxview = this.chatboxviews.get(jid); chatboxview = this.chatboxviews.get(jid);
expect(chatboxview.$el.is(':visible')).toBeTruthy(); expect(chatboxview.$el.is(':visible')).toBeTruthy();
// Test for multiple JIDs // Test for multiple JIDs