Merge lp:~libqtelegram-team/telegram-app/telegram-app-dev-fix-ampersand-url-message into lp:telegram-app/app-dev

Proposed by Mihir Soni
Status: Rejected
Rejected by: Michał Karnicki
Proposed branch: lp:~libqtelegram-team/telegram-app/telegram-app-dev-fix-ampersand-url-message
Merge into: lp:telegram-app/app-dev
Diff against target: 14 lines (+3/-1)
1 file modified
components/TelegramDelegate.qml (+3/-1)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/telegram-app-dev-fix-ampersand-url-message
Reviewer Review Type Date Requested Status
Mihir Soni Pending
libqtelegram team Pending
Review via email: mp+240348@code.launchpad.net

Commit message

Fixed Messages containing a URL and an ampersand truncated Edit bug #1385433

Description of the change

Fixed Messages containing a URL and an ampersand truncated Edit bug #1385433

To post a comment you must log in.

Unmerged revisions

153. By Mihir Soni

Fixed URL message truncated while there is an ampersand

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'components/TelegramDelegate.qml'
--- components/TelegramDelegate.qml 2014-10-31 09:35:47 +0000
+++ components/TelegramDelegate.qml 2014-11-01 05:54:43 +0000
@@ -180,7 +180,9 @@
180 // check for links180 // check for links
181 var htmlText = BaLinkify.linkify(text);181 var htmlText = BaLinkify.linkify(text);
182 if (htmlText !== text) {182 if (htmlText !== text) {
183 return htmlText183 //Replacing &(ampersand) with unicode
184 //because Label text is truncating text if there is URL and &
185 return htmlText.replace(/&/,'&')
184 }186 }
185 // linkify phone numbers if no web links were found187 // linkify phone numbers if no web links were found
186 return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');188 return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');

Subscribers

People subscribed via source and target branches

to all changes: