messaging-app

Merge lp:~tiagosh/messaging-app/revert_nbsp_replace into lp:messaging-app

  1. revert_nbsp_replace
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Bill Filler
Approved revision: 447
Merged at revision: 446
Proposed branch: lp:~tiagosh/messaging-app/revert_nbsp_replace
Merge into: lp:messaging-app
Diff against target: 12 lines (+0/-2)
1 file modified
src/qml/MessageBubble.qml (+0/-2)
To merge this branch: bzr merge lp:~tiagosh/messaging-app/revert_nbsp_replace
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+273539@code.launchpad.net

Commit message

Revert patch that replaces empty spaces by  , as it breaks word wrap.

Description of the change

Revert patch that replaces empty spaces by  , as it breaks word wrap.

To post a comment you must log in.
lp:~tiagosh/messaging-app/revert_nbsp_replace updated
447. By Tiago Salem Herrmann

Replace each \n by one <br />

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/663/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/176
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23992

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/664/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/177
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4520
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23994

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/MessageBubble.qml'
2--- src/qml/MessageBubble.qml 2015-08-26 14:22:14 +0000
3+++ src/qml/MessageBubble.qml 2015-10-06 15:15:40 +0000
4@@ -52,8 +52,6 @@
5 function parseText(text) {
6 // remove html tags
7 text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
8- // replace spaces
9- text = text.replace(/ /g, '&nbsp;');
10 // replace line breaks
11 text = text.replace(/\n/g, '<br />');
12 // check for links

Subscribers

People subscribed via source and target branches