Merge lp:~ahayzen/music-app/remix-fix-empty-songs into lp:music-app/remix

[Andrew Hayzen]

* Fix for empty songs in page after selecting album from recent
* Enforce a sync after a clear
* Allow clear to run even if canLoad is false

* Fix for empty songs in page after selecting album from recent
* Enforce a sync after a clear
* Allow clear to run even if canLoad is false

[lp:~ahayzen/music-app/remix-fix-empty-songs]

712. By Andrew Hayzen on 2014-10-28

* Enforce a sync after a clear
* Allow clear to run even if canLoad is false

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

PASSED: Continuous integration, rev:711
http://91.189.93.70:8080/job/music-app-remix-ci/204/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1333
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/204

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM! Thanks for patching this up!

review: Approve

=== modified file 'MusicStart.qml'
--- MusicStart.qml	2014-10-27 00:08:31 +0000
+++ MusicStart.qml	2014-10-28 04:05:31 +0000
@@ -71,7 +71,7 @@
                 var comp = Qt.createComponent("common/SongsPage.qml")
                 var songsPage = comp.createObject(mainPageStack,
                                                   {
-                                                      "album": model.type !== "playlist" ? title : undefined,
+                                                      "album": model.type !== "playlist" ? model.data : undefined,
                                                       "covers": coverSources,
                                                       "isAlbum": (model.type === "album"),
                                                       "genre": undefined,

=== modified file 'WorkerModelLoader.qml'
--- WorkerModelLoader.qml	2014-10-28 03:18:31 +0000
+++ WorkerModelLoader.qml	2014-10-28 04:05:31 +0000
@@ -75,7 +75,7 @@
      }
 
      function clear() {
-         if (canLoad && list !== null) {
+         if (list !== null) {
              sendMessage({'clear': true, 'model': model})
          }
      }

=== modified file 'worker-library-loader.js'
--- worker-library-loader.js	2014-10-27 23:45:25 +0000
+++ worker-library-loader.js	2014-10-28 04:05:31 +0000
@@ -21,6 +21,7 @@
 WorkerScript.onMessage = function(msg) {
     if (msg.clear === true) {
         msg.model.clear();
+        msg.model.sync();
         WorkerScript.sendMessage({});
     } else if (msg.sync === true) {
         msg.model.sync();   // updates the changes to the list