Merge lp:~osomon/webbrowser-app/simplify-historyviewwide into lp:webbrowser-app

[Olivier Tilloy]

Simplify the implementation of HistoryViewWide quite a bit,
and as a side effect fix a unit test failure when run against the staging branch of the UITK.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1399
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/289/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/289/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/289
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/289
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/289
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/289/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/289/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1399
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2682/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6803/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1435
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1435/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1435
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6814
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28062

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2682/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml	2016-03-01 09:59:31 +0000
+++ src/app/webbrowser/HistoryViewWide.qml	2016-04-07 14:01:51 +0000
@@ -109,7 +109,7 @@
 
         spacing: units.gu(1)
 
-        Item {
+        FocusScope {
             width: units.gu(40)
             height: parent.height
 
@@ -118,54 +118,17 @@
                 objectName: "lastVisitDateListView"
 
                 anchors.fill: parent
+                focus: true
 
                 currentIndex: 0
-                onCurrentIndexChanged: {
-                    if (currentItem) {
-                        historyLastVisitDateModel.lastVisitDate = currentItem.lastVisitDate
-                    }
-                    urlsListView.ViewItems.selectedIndices = []
-                }
-
-                // Manually track the current date, so that we can detect when
-                // the ListView automatically changes the currentItem as result
-                // of a change in the model that removes the currentItem.
-                // When this happens, we reset the currentItem to "all dates".
-                property date currentDate
-
-                // Ignore currentItemChanged signals while we are changing the
-                // currentIndex manually (as a result of either UP and DOWN key
-                // presses, or clicking on items)
-                // Any other emission of currentItemChanged will therefore be
-                // from ListView changing it automatically.
-                function explicitlyChangeCurrentIndex(changeAction) {
-                    explicitlySettingCurrentIndex = true
-                    changeAction()
-                    explicitlySettingCurrentIndex = false
-                    currentDate = currentItem.lastVisitDate
-                }
-                property bool explicitlySettingCurrentIndex: false
-                Keys.onDownPressed: explicitlyChangeCurrentIndex(incrementCurrentIndex)
-                Keys.onUpPressed: explicitlyChangeCurrentIndex(function() {
-                    if (lastVisitDateListView.currentIndex == 0 && searchMode) {
-                        searchQuery.focus = true
-                    } else {
-                        lastVisitDateListView.decrementCurrentIndex()
-                    }
-                })
-
-                onCurrentItemChanged: {
-                    if (explicitlySettingCurrentIndex) return;
-                    if (currentItem.lastVisitDate.valueOf() !== currentDate.valueOf()) {
-                        currentIndex = 0
-                    }
-                }
+                onCurrentIndexChanged: urlsListView.ViewItems.selectedIndices = []
 
                 model: HistoryLastVisitDateListModel {
                     sourceModel: historyLastVisitDateModel.model
                 }
 
                 delegate: ListItem {
+                    id: lastVisitDateDelegate
                     objectName: "lastVisitDateDelegate"
 
                     property var lastVisitDate: model.lastVisitDate
@@ -215,7 +178,7 @@
                         }
 
                         fontSize: "small"
-                        color: (!lastVisitDateListView.activeFocus && (lastVisitDateListView.currentIndex == index)) ? UbuntuColors.orange : UbuntuColors.darkGrey
+                        color: (!lastVisitDateListView.activeFocus && lastVisitDateDelegate.ListView.isCurrentItem) ? UbuntuColors.orange : UbuntuColors.darkGrey
                     }
 
                     divider {
@@ -227,10 +190,34 @@
                         Behavior on opacity { UbuntuNumberAnimation {} }
                     }
 
-                    onClicked: ListView.view.explicitlyChangeCurrentIndex(function() { ListView.view.currentIndex = index })
+                    onClicked: ListView.view.currentIndex = index
+
+                    ListView.onRemove: {
+                        if (ListView.isCurrentItem) {
+                            // For some reason, setting the current index here
+                            // results in it being reset to its previous value
+                            // right away. Delaying it with a timer so the
+                            // operation is queued does the trick.
+                            resetIndexTimer.restart()
+                        }
+                    }
                 }
 
                 highlight: ListViewHighlight {}
+
+                Timer {
+                    id: resetIndexTimer
+                    interval: 0
+                    onTriggered: lastVisitDateListView.currentIndex = 0
+                }
+            }
+
+            Keys.onUpPressed: {
+                if (searchMode) {
+                    searchQuery.focus = true
+                } else {
+                    event.accepted = false
+                }
             }
 
             Scrollbar {
@@ -254,7 +241,7 @@
 
                 model: SortFilterModel {
                     id: historyLastVisitDateModel
-                    property date lastVisitDate
+                    readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : ""
                     filter {
                         property: "lastVisitDateString"
                         pattern: new RegExp(lastVisitDate.isValid() ? "^%1$".arg(Qt.formatDate(lastVisitDate, "yyyy-MM-dd")) : "")