1
=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
2
--- plugins/westernsupport/westernlanguagefeatures.cpp	2015-01-28 13:56:23 +0000
3
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2016-06-14 15:58:18 +0000
4
@@ -60,7 +60,7 @@
5
60
        return false;
60
        return false;
6
61
    }
61
    }
7
62
62
9
63
    if (sentenceBreak.contains(preedit.mid(preedit.length() - 2, 1)) && preedit.right(1) == " ") {
63
    if (sentenceBreak.contains(preedit.mid(preedit.length() - 2, 1)) && preedit.at(preedit.count() - 1).isSpace()) {
10
64
        return true;
64
        return true;
11
65
    }
65
    }
12
66
66
13
67
67
14
=== modified file 'src/view/abstracttexteditor.cpp'
15
--- src/view/abstracttexteditor.cpp	2016-04-27 23:37:27 +0000
16
+++ src/view/abstracttexteditor.cpp	2016-06-14 15:58:18 +0000
17
@@ -512,7 +512,7 @@
18
512
                d->previous_preedit_position -= 1;
512
                d->previous_preedit_position -= 1;
19
513
            }
513
            }
20
514
        }
514
        }
22
515
        else if (look_for_a_double_space && not stopSequence.isEmpty() && textOnLeft.right(1) == " ") {
515
        else if (look_for_a_double_space && not stopSequence.isEmpty() && textOnLeft.at(textOnLeft.count() - 1).isSpace()) {
23
516
            removeTrailingWhitespaces();
516
            removeTrailingWhitespaces();
24
517
            if (!d->word_engine->languageFeature()->commitOnSpace()) {
517
            if (!d->word_engine->languageFeature()->commitOnSpace()) {
25
518
                // Commit when inserting a fullstop if we don't insert on spaces
518
                // Commit when inserting a fullstop if we don't insert on spaces
26
@@ -870,7 +870,7 @@
27
870
    QString::const_iterator i = textOnLeft.cend();
870
    QString::const_iterator i = textOnLeft.cend();
28
871
    while (i != begin) {
871
    while (i != begin) {
29
872
        --i;
872
        --i;
31
873
        if (*i != ' ') break;
873
        if (!i->isSpace()) break;
32
874
        singleBackspace();
874
        singleBackspace();
33
875
    }
875
    }
34
876
}
876
}
35
877
877
36
=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
37
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2016-04-28 00:42:26 +0000
38
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2016-06-14 15:58:18 +0000
39
@@ -1301,6 +1301,54 @@
40
1301
            Eventually(Equals(expected))
1301
            Eventually(Equals(expected))
41
1302
        )
1302
        )
42
1303
1303
43
1304
    def test_double_space(self):
44
1305
        """Test that double space still inserts a full-stop and replaces all
45
1306
        white spaces characters, even if they're non breaking spaces.
46
1307
47
1308
        """
48
1309
        qml = dedent("""
49
1310
        import QtQuick 2.4
50
1311
        import Ubuntu.Components 1.3
51
1312
        import Ubuntu.Web 0.2
52
1313
53
1314
        Rectangle {
54
1315
            id: window
55
1316
            objectName: "windowRectangle"
56
1317
            color: "lightgrey"
57
1318
58
1319
            WebView {
59
1320
                anchors.fill: parent
60
1321
                objectName: "webview"
61
1322
                Component.onCompleted: {
62
1323
                    loadHtml("
63
1324
                        <html><body><textarea id='textarea'
64
1325
                        onkeyup=\\\"document.title=
65
1326
                        document.getElementById('textarea').value;\\\"
66
1327
                        style='width: 100%; height: 100%;'>&nbsp;</textarea>
67
1328
                        </body></html>"
68
1329
                    );
69
1330
                }
70
1331
            }
71
1332
        }
72
1333
73
1334
        """)
74
1335
        app = self._start_qml_script(qml)
75
1336
        webview = app.select_single(objectName='webview')
76
1337
77
1338
        self.ensure_focus_on_input(webview)
78
1339
        keyboard = Keyboard()
79
1340
        self.addCleanup(keyboard.dismiss)
80
1341
81
1342
        keyboard.type('  ')
82
1343
83
1344
        # The page title trims white space, so we just look for the
84
1345
        # full-stop, rather than '. '
85
1346
        expected = "."
86
1347
        self.assertThat(
87
1348
            webview.title,
88
1349
            Eventually(Equals(expected))
89
1350
        )
90
1351
91
1304
    def test_hiding(self):
1352
    def test_hiding(self):
92
1305
        """Verify that the keyboard remains hidden after being dismissed from
1353
        """Verify that the keyboard remains hidden after being dismissed from
93
1306
        a field that is no longer enabled.
1354
        a field that is no longer enabled.
Status:	Merged
Approved by:	Bill Filler on 2016-06-14
Approved revision:	477
Merged at revision:	479
Proposed branch:	lp:~michael-sheldon/ubuntu-keyboard/fix-non-breaking-spaces
Merge into:	lp:ubuntu-keyboard
Diff against target:	93 lines (+51/-3) 3 files modified plugins/westernsupport/westernlanguagefeatures.cpp (+1/-1) src/view/abstracttexteditor.cpp (+2/-2) tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+48/-0)
To merge this branch:	bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-non-breaking-spaces
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-06-14
PS Jenkins bot	continuous-integration		Pending
Ubuntu Phablet Team		2016-06-10	Pending
Review via email: mp+297048@code.launchpad.net