1
=== modified file 'src/qml/DialerPage/DialerPage.qml'
2
--- src/qml/DialerPage/DialerPage.qml	2014-07-02 17:11:00 +0000
3
+++ src/qml/DialerPage/DialerPage.qml	2014-07-07 17:36:47 +0000
4
@@ -160,10 +160,8 @@
5
160
            onPressAndHold: input.text = ""
160
            onPressAndHold: input.text = ""
6
161
161
7
162
            onClicked:  {
162
            onClicked:  {
12
163
                if (input.cursorPosition != 0)  {
163
                if (input.cursorPosition > 0)  {
13
164
                    var position = input.cursorPosition;
164
                    input.remove(input.cursorPosition, input.cursorPosition - 1)
10
165
                    input.text = input.text.slice(0, input.cursorPosition - 1) + input.text.slice(input.cursorPosition);
11
166
                    input.cursorPosition = position - 1;
14
167
                }
165
                }
15
168
            }
166
            }
16
169
        }
167
        }
17
@@ -281,13 +279,7 @@
18
281
            }
279
            }
19
282
280
20
283
            onKeyPressed: {
281
            onKeyPressed: {
28
284
                if (input.cursorPosition != 0)  {
282
                input.insert(input.cursorPosition, label)
22
285
                    var position = input.cursorPosition;
23
286
                    input.text = input.text.slice(0, input.cursorPosition) + label + input.text.slice(input.cursorPosition);
24
287
                    input.cursorPosition = position +1 ;
25
288
                } else {
26
289
                    keypadEntry.value += label
27
290
                }
29
291
            }
283
            }
30
292
        }
284
        }
31
293
285
32
294
286
33
=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
34
--- src/qml/DialerPage/KeypadEntry.qml	2014-06-13 17:21:22 +0000
35
+++ src/qml/DialerPage/KeypadEntry.qml	2014-07-07 17:36:47 +0000
36
@@ -31,7 +31,7 @@
37
31
31
38
32
    height: input.height
32
    height: input.height
39
33
33
41
34
    TextInput {
34
    PhoneNumberInput {
42
35
        id: input
35
        id: input
43
36
36
44
37
        property bool __adjusting: false
37
        property bool __adjusting: false
45
@@ -51,22 +51,10 @@
46
51
        cursorVisible: true
51
        cursorVisible: true
47
52
        clip: true
52
        clip: true
48
53
        opacity: 0.9
53
        opacity: 0.9
65
54
54
        defaultRegion: i18n.tr("US")
66
55
        AsYouTypeFormatter {
55
        updateOnlyWhenFocused: false
67
56
            id: formatter
56
        // FIXME: this should probably be done in the component itself
68
57
57
        autoFormat: input.text.length > 0 && input.text.charAt(0) !== "*" && input.text.charAt(0) !== "#"
53
58
            // FIXME: this should probably be done in the component itself
54
59
            property string firstDigit: input.text.slice(0,1)
55
60
            enabled: firstDigit != "*" && firstDigit != "#"
56
61
            defaultRegionCode: "US"
57
62
            text: input.text
58
63
        }
59
64
60
65
        Binding {
61
66
            target: input
62
67
            property: "text"
63
68
            value: formatter.formattedText
64
69
        }
69
70
58
70
71
        // Use a custom cursor that does not blink to avoid extra CPU usage.
59
        // Use a custom cursor that does not blink to avoid extra CPU usage.
71
72
        // https://bugs.launchpad.net/dialer-app/+bug/1188669
60
        // https://bugs.launchpad.net/dialer-app/+bug/1188669
Status:	Merged
Approved by:	Tiago Salem Herrmann on 2014-07-07
Approved revision:	170
Merged at revision:	170
Proposed branch:	lp:~renatofilho/dialer-app/fix-phone-formatter
Merge into:	lp:dialer-app
Diff against target:	71 lines (+8/-28) 2 files modified src/qml/DialerPage/DialerPage.qml (+3/-11) src/qml/DialerPage/KeypadEntry.qml (+5/-17)
To merge this branch:	bzr merge lp:~renatofilho/dialer-app/fix-phone-formatter
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-07-04	Approve on 2014-07-07
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-07
Review via email: mp+225697@code.launchpad.net
1	=== modified file 'src/qml/DialerPage/DialerPage.qml'
2	--- src/qml/DialerPage/DialerPage.qml 2014-07-02 17:11:00 +0000
3	+++ src/qml/DialerPage/DialerPage.qml 2014-07-07 17:36:47 +0000
4	@@ -160,10 +160,8 @@
5	160	onPressAndHold: input.text = ""	160	onPressAndHold: input.text = ""
6	161		161
7	162	onClicked: {	162	onClicked: {
12	163	if (input.cursorPosition != 0) {	163	if (input.cursorPosition > 0) {
13	164	var position = input.cursorPosition;	164	input.remove(input.cursorPosition, input.cursorPosition - 1)
10	165	input.text = input.text.slice(0, input.cursorPosition - 1) + input.text.slice(input.cursorPosition);
11	166	input.cursorPosition = position - 1;
14	167	}	165	}
15	168	}	166	}
16	169	}	167	}
17	@@ -281,13 +279,7 @@
18	281	}	279	}
19	282		280
20	283	onKeyPressed: {	281	onKeyPressed: {
28	284	if (input.cursorPosition != 0) {	282	input.insert(input.cursorPosition, label)
22	285	var position = input.cursorPosition;
23	286	input.text = input.text.slice(0, input.cursorPosition) + label + input.text.slice(input.cursorPosition);
24	287	input.cursorPosition = position +1 ;
25	288	} else {
26	289	keypadEntry.value += label
27	290	}
29	291	}	283	}
30	292	}	284	}
31	293		285
32	294		286
33	=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
34	--- src/qml/DialerPage/KeypadEntry.qml 2014-06-13 17:21:22 +0000
35	+++ src/qml/DialerPage/KeypadEntry.qml 2014-07-07 17:36:47 +0000
36	@@ -31,7 +31,7 @@
37	31		31
38	32	height: input.height	32	height: input.height
39	33		33
41	34	TextInput {	34	PhoneNumberInput {
42	35	id: input	35	id: input
43	36		36
44	37	property bool __adjusting: false	37	property bool __adjusting: false
45	@@ -51,22 +51,10 @@
46	51	cursorVisible: true	51	cursorVisible: true
47	52	clip: true	52	clip: true
48	53	opacity: 0.9	53	opacity: 0.9
65	54		54	defaultRegion: i18n.tr("US")
66	55	AsYouTypeFormatter {	55	updateOnlyWhenFocused: false
67	56	id: formatter	56	// FIXME: this should probably be done in the component itself
68	57		57	autoFormat: input.text.length > 0 && input.text.charAt(0) !== "*" && input.text.charAt(0) !== "#"
53	58	// FIXME: this should probably be done in the component itself
54	59	property string firstDigit: input.text.slice(0,1)
55	60	enabled: firstDigit != "*" && firstDigit != "#"
56	61	defaultRegionCode: "US"
57	62	text: input.text
58	63	}
59	64
60	65	Binding {
61	66	target: input
62	67	property: "text"
63	68	value: formatter.formattedText
64	69	}
69	70		58
70	71	// Use a custom cursor that does not blink to avoid extra CPU usage.	59	// Use a custom cursor that does not blink to avoid extra CPU usage.
71	72	// https://bugs.launchpad.net/dialer-app/+bug/1188669	60	// https://bugs.launchpad.net/dialer-app/+bug/1188669