1
=== modified file 'src/app/webbrowser/Browser.qml'
2
--- src/app/webbrowser/Browser.qml	2015-08-14 09:25:38 +0000
3
+++ src/app/webbrowser/Browser.qml	2015-08-16 01:38:10 +0000
4
@@ -757,6 +757,7 @@
5
757
757
6
758
        onStatusChanged: {
758
        onStatusChanged: {
7
759
            if (status == Loader.Ready) {
759
            if (status == Loader.Ready) {
8
760
                historyViewTimer.restart()
9
760
                historyViewLoader.item.forceActiveFocus()
761
                historyViewLoader.item.forceActiveFocus()
10
761
            } else {
762
            } else {
11
762
                internal.resetFocus()
763
                internal.resetFocus()
12
@@ -766,9 +767,9 @@
13
766
        Keys.onEscapePressed: historyViewLoader.active = false
767
        Keys.onEscapePressed: historyViewLoader.active = false
14
767
768
15
768
        Timer {
769
        Timer {
16
770
            id: historyViewTimer
17
769
            // Set the model asynchronously to ensure
771
            // Set the model asynchronously to ensure
18
770
            // the view is displayed as early as possible.
772
            // the view is displayed as early as possible.
19
771
            running: historyViewLoader.active
20
772
            interval: 1
773
            interval: 1
21
773
            onTriggered: historyViewLoader.item.historyModel = browser.historyModel
774
            onTriggered: historyViewLoader.item.historyModel = browser.historyModel
22
774
        }
775
        }
23
@@ -825,14 +826,6 @@
24
825
                    internal.resetFocus()
826
                    internal.resetFocus()
25
826
                }
827
                }
26
827
828
27
828
                Timer {
28
829
                    // Set the model asynchronously to ensure
29
830
                    // the view is displayed as early as possible.
30
831
                    running: true
31
832
                    interval: 1
32
833
                    onTriggered: historyModel = browser.historyModel
33
834
                }
34
835
35
836
                onHistoryEntryClicked: {
829
                onHistoryEntryClicked: {
36
837
                    browser.openUrlInNewTab(url, true)
830
                    browser.openUrlInNewTab(url, true)
37
838
                    done()
831
                    done()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-08-17
Olivier Tilloy		2015-08-15	Approve on 2015-08-17
Review via email: mp+268154@code.launchpad.net