mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Allow line breaks in messages. Closes issue #291

Browse source 
Line breaks can now be insterted into message box using Shift+Enter or Alt+Enter. Messages with new lines are properly displayed in the conversation view (but only there, to keep inbox clean). The template was modified to allow HTML, but the message itself is sanitized before new line handling is run.
This commit is contained in:
adambar 2015-07-02 23:00:50 +02:00
parent 52857f09ea
commit 86f7b7adf5
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
background.html
View file

@ -65,7 +65,7 @@
{{> avatar }} {{> avatar }}
<div class="bubble"> <div class="bubble">
<div class='attachments'></div> <div class='attachments'></div>
<p class="content">{{ message }}</p> <p class="content">{{& message }}</p>
<div class='meta'> <div class='meta'>
<span class='timestamp'>{{ timestamp }}</span> <span class='timestamp'>{{ timestamp }}</span>
<span class='checkmark hide'>✓</span> <span class='checkmark hide'>✓</span>

2
js/views/conversation_view.js
View file

@ -210,7 +210,7 @@
updateMessageFieldSize: function (event) { updateMessageFieldSize: function (event) {
var keyCode = event.which || event.keyCode; var keyCode = event.which || event.keyCode;
if (keyCode === 13) { if (keyCode === 13 && !event.altKey && !event.shiftKey) {
// enter pressed - submit the form now // enter pressed - submit the form now
event.preventDefault(); event.preventDefault();
return this.$('.bottom-bar form').submit(); return this.$('.bottom-bar form').submit();

7
js/views/message_view.js
View file

@ -55,11 +55,16 @@
autoLink: function(text) { autoLink: function(text) {
return text.replace(/(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi, "$1<a href='$2' target='_blank'>$2</a>"); return text.replace(/(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi, "$1<a href='$2' target='_blank'>$2</a>");
}, },
sanitizeMessage: function (message) {
var element = document.createElement('span');
element.innerText = message;
return element.innerHTML.trim().replace(/\n/g, '<br>');
},
render: function() { render: function() {
var contact = this.model.getContact(); var contact = this.model.getContact();
this.$el.html( this.$el.html(
Mustache.render(this.template, { Mustache.render(this.template, {
message: this.model.get('body'), message: this.sanitizeMessage(this.model.get('body')),
timestamp: moment(this.model.get('sent_at')).fromNow(), timestamp: moment(this.model.get('sent_at')).fromNow(),
sender: (contact && contact.getTitle()) || '', sender: (contact && contact.getTitle()) || '',
avatar: (contact && contact.getAvatar()) avatar: (contact && contact.getAvatar())