Merge lp:~ahayzen/music-app/fix-columnflow-reset-tab-change into lp:music-app/remix

[Andrew Hayzen]

* Fix the ColumnFlow.qml so that it does not reset on tab change
* Ensure search is reset on state change

* Fix the ColumnFlow.qml so that it does not reset on tab change
* Ensure search is reset on state change

Extra code that was added when debugging and now not needed.

[lp:~ahayzen/music-app/fix-columnflow-reset-tab-change]

778. By Andrew Hayzen on 2015-01-11

* Ensure search is reset on state change

779. By Andrew Hayzen on 2015-01-11

* Simplify the logic

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:777
http://91.189.93.70:8080/job/music-app-ci/1207/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/641
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/641/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/59

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1207/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'common/ColumnFlow.qml'
--- common/ColumnFlow.qml	2015-01-11 15:54:04 +0000
+++ common/ColumnFlow.qml	2015-01-11 17:55:18 +0000
@@ -61,11 +61,6 @@
         }
     }
 
-    onModelChanged: {  // reload the model when it is set
-        reset()
-        append(true, model.count - 1)
-    }
-
     onVisibleChanged: {
         if (visible && delayRebuildIndex !== -1) {  // restore from count change
             if (delayRebuildIndex === 0) {

=== modified file 'common/SearchHeadState.qml'
--- common/SearchHeadState.qml	2015-01-11 15:54:04 +0000
+++ common/SearchHeadState.qml	2015-01-11 17:55:18 +0000
@@ -27,10 +27,7 @@
         id: leaveSearchAction
         text: "back"
         iconName: "back"
-        onTriggered: {
-            thisPage.state = "default"
-            searchField.text = ""
-        }
+        onTriggered: thisPage.state = "default"
     }
     contents: TextField {
         id: searchField
@@ -54,12 +51,18 @@
         // This is used when popping from the pageStack and returning back to a page with search
         Connections {
             target: thisPage
+
+            onStateChanged: {  // ensure the search is reset (eg pressing Esc)
+                if (state === "default") {
+                    searchField.text = ""
+                }
+            }
+
             onVisibleChanged: {
                 // clear when the page becomes visible not invisible
                 // if invisible is used the delegates can be destroyed which
                 // have created the pushed component
                 if (visible) {
-                    searchField.text = ""
                     thisPage.state = "default"
                 }
             }