Merge lp:~seb128/messaging-app/display-lines-spaces into lp:messaging-app

[Sebastien Bacher]

display empty lines and leading spaces

display empty lines and leading spaces

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/637/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/150
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3866
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3866/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22838

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/637/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

tested on the device and works fine.
Thanks.

review: Approve

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2015-08-17 17:39:45 +0000
+++ src/qml/MessageBubble.qml	2015-08-26 14:34:09 +0000
@@ -52,8 +52,10 @@
     function parseText(text) {
         // remove html tags
         text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
+        // replace spaces
+        text = text.replace(/ /g, '&nbsp;');
         // replace line breaks
-        text = text.replace(/(\n)+/g, '<br />');
+        text = text.replace(/\n/g, '<br />');
         // check for links
         var htmlText = BaLinkify.linkify(text);
         if (htmlText !== text) {