From ad036ea75f6e8fad88af7ca46ac080c13c65a5ea Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Sun, 20 Mar 2016 01:47:51 +0100 Subject: [PATCH 1/2] Remove split of fullname. Fixes #609 --- docs/CHANGES.md | 2 ++ src/converse-core.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/CHANGES.md b/docs/CHANGES.md index 46f80444f..1f200743a 100755 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -25,6 +25,8 @@ - #592 Add random resource for `auto_login`, add method generateResource to generate random resource [davec82] - #598 Add option `synchronize_availability` [davec82] - #600 Fix change xmpp status also on icon-status click [davec82] +- #616 converse-otr should depend on converse-minimize [jcbrand] +- #609 Remove split of fullname [lixmal] ## 0.10.1 (2016-02-06) diff --git a/src/converse-core.js b/src/converse-core.js index c56dbc764..2bbf98df4 100755 --- a/src/converse-core.js +++ b/src/converse-core.js @@ -1241,7 +1241,9 @@ } else { from = Strophe.getBareJidFromJid($message.attr('from')); } - fullname = (_.isEmpty(fullname) ? from: fullname).split(' ')[0]; + if (_.isEmpty(fullname)) { + fullname = from; + } if (delayed) { stamp = $delay.attr('stamp'); time = stamp; From eec2a4f5e9669d943d76a07dfed799e63be0e197 Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Wed, 23 Mar 2016 23:27:25 +0100 Subject: [PATCH 2/2] Fix tests for #609 --- spec/chatbox.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/spec/chatbox.js b/spec/chatbox.js index 44d5915b8..7dffb5808 100644 --- a/spec/chatbox.js +++ b/spec/chatbox.js @@ -446,9 +446,7 @@ expect(chatbox.messages.length).toEqual(1); var msg_obj = chatbox.messages.models[0]; expect(msg_obj.get('message')).toEqual(message); - // XXX: This is stupid, fullname is actually only the - // users first name - expect(msg_obj.get('fullname')).toEqual(mock.cur_names[0].split(' ')[0]); + expect(msg_obj.get('fullname')).toEqual(mock.cur_names[0]); expect(msg_obj.get('sender')).toEqual('them'); expect(msg_obj.get('delayed')).toEqual(false); // Now check that the message appears inside the chatbox in the DOM @@ -506,7 +504,7 @@ expect(chatbox.messages.length).toEqual(1); var msg_obj = chatbox.messages.models[0]; expect(msg_obj.get('message')).toEqual(msgtext); - expect(msg_obj.get('fullname')).toEqual(mock.cur_names[1].split(' ')[0]); + expect(msg_obj.get('fullname')).toEqual(mock.cur_names[1]); expect(msg_obj.get('sender')).toEqual('them'); expect(msg_obj.get('delayed')).toEqual(false); // Now check that the message appears inside the chatbox in the DOM @@ -547,7 +545,7 @@ expect(chatbox.messages.length).toEqual(1); var msg_obj = chatbox.messages.models[0]; expect(msg_obj.get('message')).toEqual(msgtext); - expect(msg_obj.get('fullname')).toEqual(mock.cur_names[5].split(' ')[0]); + expect(msg_obj.get('fullname')).toEqual(mock.cur_names[5]); expect(msg_obj.get('sender')).toEqual('me'); expect(msg_obj.get('delayed')).toEqual(false); // Now check that the message appears inside the chatbox in the DOM @@ -631,7 +629,7 @@ expect(chatbox.messages.length).toEqual(1); msg_obj = chatbox.messages.models[0]; expect(msg_obj.get('message')).toEqual(message); - expect(msg_obj.get('fullname')).toEqual(contact_name.split(' ')[0]); + expect(msg_obj.get('fullname')).toEqual(contact_name); expect(msg_obj.get('sender')).toEqual('them'); expect(msg_obj.get('delayed')).toEqual(true); msg_txt = $chat_content.find('.chat-message').find('.chat-msg-content').text(); @@ -662,7 +660,7 @@ expect(chatbox.messages.length).toEqual(2); msg_obj = chatbox.messages.models[1]; expect(msg_obj.get('message')).toEqual(message); - expect(msg_obj.get('fullname')).toEqual(contact_name.split(' ')[0]); + expect(msg_obj.get('fullname')).toEqual(contact_name); expect(msg_obj.get('sender')).toEqual('them'); expect(msg_obj.get('delayed')).toEqual(false); msg_txt = $chat_content.find('.chat-message').last().find('.chat-msg-content').text(); @@ -893,7 +891,7 @@ // Check that the notification appears inside the chatbox in the DOM var $events = chatboxview.$el.find('.chat-event'); expect($events.length).toBe(1); - expect($events.text()).toEqual(mock.cur_names[1].split(' ')[0] + ' is typing'); + expect($events.text()).toEqual(mock.cur_names[1] + ' is typing'); }.bind(converse)); }.bind(converse)); @@ -967,7 +965,7 @@ var chatboxview = this.chatboxviews.get(sender_jid); var $events = chatboxview.$el.find('.chat-event'); expect($events.length).toBe(1); - expect($events.text()).toEqual(mock.cur_names[1].split(' ')[0] + ' has stopped typing'); + expect($events.text()).toEqual(mock.cur_names[1] + ' has stopped typing'); }.bind(converse)); }.bind(converse)); @@ -1073,7 +1071,7 @@ var chatboxview = this.chatboxviews.get(sender_jid); var $events = chatboxview.$el.find('.chat-event'); expect($events.length).toBe(1); - expect($events.text()).toEqual(mock.cur_names[1].split(' ')[0] + ' has gone away'); + expect($events.text()).toEqual(mock.cur_names[1] + ' has gone away'); }.bind(converse)); }.bind(converse)); }.bind(converse));