1
=== modified file 'debian/control'
2
--- debian/control	2014-09-10 20:02:04 +0000
3
+++ debian/control	2014-11-18 17:32:47 +0000
4
@@ -16,6 +16,7 @@
5
16
               qtdeclarative5-gsettings1.0,
16
               qtdeclarative5-gsettings1.0,
6
17
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
17
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
7
18
               qtdeclarative5-ubuntu-history0.1,
18
               qtdeclarative5-ubuntu-history0.1,
8
19
               qtdeclarative5-ubuntu-telephony-phonenumber0.1,
9
19
               qtpim5-dev,
20
               qtpim5-dev,
10
20
               xvfb,
21
               xvfb,
11
21
Standards-Version: 3.9.4
22
Standards-Version: 3.9.4
12
@@ -31,6 +32,7 @@
13
31
Depends: ${misc:Depends},
32
Depends: ${misc:Depends},
14
32
         ${shlibs:Depends},
33
         ${shlibs:Depends},
15
33
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
34
         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
16
35
         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
17
34
         qtdeclarative5-ubuntu-history0.1 | qtdeclarative5-ubuntu-history-plugin,
36
         qtdeclarative5-ubuntu-history0.1 | qtdeclarative5-ubuntu-history-plugin,
18
35
         qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
37
         qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
19
36
         qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),
38
         qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),
20
37
39
21
=== modified file 'src/qml/MessageBubble.qml'
22
--- src/qml/MessageBubble.qml	2014-10-21 16:17:17 +0000
23
+++ src/qml/MessageBubble.qml	2014-11-18 17:32:47 +0000
24
@@ -19,6 +19,7 @@
25
19
import QtQuick 2.2
19
import QtQuick 2.2
26
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
27
21
import Ubuntu.History 0.1
21
import Ubuntu.History 0.1
28
22
import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneNumber
29
22
23
30
23
import "dateUtils.js" as DateUtils
24
import "dateUtils.js" as DateUtils
31
24
import "3rd_party/ba-linkify.js" as BaLinkify
25
import "3rd_party/ba-linkify.js" as BaLinkify
32
@@ -38,8 +39,17 @@
33
38
    readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
39
    readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
34
39
                                     messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
40
                                     messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
35
40
41
36
42
    // XXXX: should be hoisted
37
43
    function getCountryCode() {
38
44
        var localeName = Qt.locale().name
39
45
        return localeName.substr(localeName.length - 2, 2)
40
46
    }
41
47
42
48
    function formatTelSchemeWith(phoneNumber) {
43
49
        return '<a href="tel:///' + phoneNumber + '">' + phoneNumber + '</a>'
44
50
    }
45
51
46
41
    function parseText(text) {
52
    function parseText(text) {
47
42
        var phoneExp = /(\+?([0-9]+[ ]?)?\(?([0-9]+)\)?[- ]?([0-9]+)[- ]?([0-9]+)[- ]?([0-9]+))/img;
48
43
        // remove html tags
53
        // remove html tags
49
44
        text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
54
        text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
50
45
        // replace line breaks
55
        // replace line breaks
51
@@ -49,8 +59,14 @@
52
49
        if (htmlText !== text) {
59
        if (htmlText !== text) {
53
50
            return htmlText
60
            return htmlText
54
51
        }
61
        }
55
62
56
52
        // linkify phone numbers if no web links were found
63
        // linkify phone numbers if no web links were found
58
53
        return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
64
        var phoneNumbers = PhoneNumber.PhoneUtils.matchInText(text, getCountryCode())
59
65
        for (var i = 0; i < phoneNumbers.length; ++i) {
60
66
            var currentNumber = phoneNumbers[i]
61
67
            text = text.replace(currentNumber, formatTelSchemeWith(currentNumber))
62
68
        }
63
69
        return text
64
54
    }
70
    }
65
55
71
66
56
    color: {
72
    color: {
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-11-09	Approve on 2014-11-18
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-11-18
Review via email: mp+241197@code.launchpad.net