Merge lp:~ahayzen/music-app/fix-1470755-playlist-0-append into lp:music-app

[Andrew Hayzen]

* Ensure that the lowest rebuild index is retained
* Use an alias to set the model as the CardView knows about preloading now

* Ensure that the lowest rebuild index is retained
* Use an alias to set the model as the CardView knows about preloading now

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

PASSED: Continuous integration, rev:879
http://91.189.93.70:8080/job/music-app-ci/1334/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/186

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I have one nitpicky comment on commentary.

review: Needs Fixing

[Victor Thompson (vthompson)]

Maybe reword to: Only update the delay index if it isn't set (-1) or if it is within the size of the model (lastIndex) and is lower than the current delayed index.

[lp:~ahayzen/music-app/fix-1470755-playlist-0-append]

880. By Andrew Hayzen on 2015-07-08

* Remove empty code comment line

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

PASSED: Continuous integration, rev:880
http://91.189.93.70:8080/job/music-app-ci/1337/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/189

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm :)

review: Approve

=== modified file 'app/components/ColumnFlow.qml'
--- app/components/ColumnFlow.qml	2015-06-07 12:35:42 +0000
+++ app/components/ColumnFlow.qml	2015-07-08 00:33:07 +0000
@@ -492,7 +492,11 @@
 
     function setDelayRebuildIndex(index)
     {
-        if (delayRebuildIndex === -1 || index < lastIndex) {
+        // Only update the delay index if it isn't set (-1) or
+        // if it is within the size of the model (lastIndex)
+        // and is lower than the current delayed index
+        if (delayRebuildIndex === -1 ||
+                (index < delayRebuildIndex && index < lastIndex)) {
             delayRebuildIndex = index
         }
     }

=== modified file 'app/components/Flickables/CardView.qml'
--- app/components/Flickables/CardView.qml	2015-05-03 16:22:31 +0000
+++ app/components/Flickables/CardView.qml	2015-07-08 00:33:07 +0000
@@ -35,17 +35,11 @@
     property alias delegate: flow.delegate
     property var getter
     property alias header: headerLoader.sourceComponent
-    property var model: flow.model
+    property alias model: flow.model
     property real itemWidth: units.gu(15)
 
     onGetterChanged: flow.getter = getter  // cannot use alias to set a function (must be var)
 
-    onVisibleChanged: {
-        if (visible) {  // only load model once CardView is visible
-            flow.model = model
-        }
-    }
-
     Loader {
         id: headerLoader
         visible: sourceComponent !== undefined