Merge lp:~libqtelegram-team/telegram-app/telegram-app-fix-linking-numbers into lp:telegram-app/app-dev

[Penk Chen]

Prevent checking for phone numbers in links that have already been processed, as in https://code.launchpad.net/~tiagosh/messaging-app/fix-share-links

[lp:~libqtelegram-team/telegram-app/telegram-app-fix-linking-numbers]

63. By Michał Karnicki on 2014-09-24

Remove line to fix linkify condition check.

[Michał Karnicki (karni)]

Removed one line. Tested, bugfix works as expected. penk, please make sure to bzr pull so you get revno 63 before merging to telegram-app-dev.

review: Approve

[Penk Chen (penk)]

Done

=== modified file 'components/TelegramDelegate.qml'
--- components/TelegramDelegate.qml	2014-08-26 15:32:21 +0000
+++ components/TelegramDelegate.qml	2014-09-24 11:53:55 +0000
@@ -114,8 +114,11 @@
                         // replace line breaks
                         text = text.replace(/(\n)+/g, '<br />');
                         // check for links
-                        text = BaLinkify.linkify(text);
-                        // linkify phone numbers
+                        var htmlText = BaLinkify.linkify(text);
+                        if (htmlText !== text) {
+                            return htmlText
+                        }
+                        // linkify phone numbers if no web links were found
                         return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
                     }
                 }