Merge lp:~artmello/webbrowser-app/webbrowser-app-fix_1484555 into lp:webbrowser-app

Proposed by Arthur Mello
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1140
Merged at revision: 1143
Proposed branch: lp:~artmello/webbrowser-app/webbrowser-app-fix_1484555
Merge into: lp:webbrowser-app
Diff against target: 37 lines (+2/-9)
1 file modified
src/app/webbrowser/Browser.qml (+2/-9)
To merge this branch: bzr merge lp:~artmello/webbrowser-app/webbrowser-app-fix_1484555
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Olivier Tilloy Approve
Review via email: mp+268154@code.launchpad.net

Commit message

Make sure to set the historyModel to the HistoryView component when browser wide property changes

Description of the change

Make sure to set the historyModel to the HistoryView component when browser wide property changes

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1139. By Arthur Mello

Simplify the way that the timer is triggered

1140. By Arthur Mello

Merge with trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good to me, thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
6 onStatusChanged: {
7 if (status == Loader.Ready) {
8+ historyViewTimer.restart()
9 historyViewLoader.item.forceActiveFocus()
10 } else {
11 internal.resetFocus()
12@@ -766,9 +767,9 @@
13 Keys.onEscapePressed: historyViewLoader.active = false
14
15 Timer {
16+ id: historyViewTimer
17 // Set the model asynchronously to ensure
18 // the view is displayed as early as possible.
19- running: historyViewLoader.active
20 interval: 1
21 onTriggered: historyViewLoader.item.historyModel = browser.historyModel
22 }
23@@ -825,14 +826,6 @@
24 internal.resetFocus()
25 }
26
27- Timer {
28- // Set the model asynchronously to ensure
29- // the view is displayed as early as possible.
30- running: true
31- interval: 1
32- onTriggered: historyModel = browser.historyModel
33- }
34-
35 onHistoryEntryClicked: {
36 browser.openUrlInNewTab(url, true)
37 done()

Subscribers

People subscribed via source and target branches

to status/vote changes: