Merge lp:~vthompson/music-app/fix-console-errors into lp:music-app/trusty

[Victor Thompson]

* Fix various console errors
* Allow Playlist count to be updated

The aim of this MR is to fix various console errors which might be preventing other logic that follows this errors from taking place--which could affect other areas of the app. Additionally, it was noticed that the playlist count is no longer being updated since the move to Qt 5.2. This has been fixed as well.

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

PASSED: Continuous integration, rev:396
http://91.189.93.70:8080/job/music-app-ci/662/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1860
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/662
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/664
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/383

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM

review: Approve

[David Planella (dpm)]

Looks good to me too!

[David Planella (dpm)]

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/423/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1902/console
    FAILURE: http://91.189.93.70:8080/job/music-app-raring-amd64-autolanding/422/console
    FAILURE: http://91.189.93.70:8080/job/music-app-saucy-amd64-autolanding/422/console
    FAILURE: http://91.189.93.70:8080/job/music-app-trusty-amd64-autolanding/117/console

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/fix-console-errors]

397. By Victor Thompson on 2014-03-28

Merge from trunk and fix conflict

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

PASSED: Continuous integration, rev:397
http://91.189.93.70:8080/job/music-app-ci/678/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1906
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/678
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/680
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/399

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

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-03-28 00:38:01 +0000
+++ MusicNowPlaying.qml	2014-03-28 16:22:04 +0000
@@ -650,7 +650,7 @@
 
                     function onCollapseExpand(indexCol)
                     {
-                        if ((indexCol === index || indexCol === -1) && expandable !== undefined && expandable.visible === true)
+                        if (indexCol === -1 && expandable !== undefined && expandable.visible === true)
                         {
                             customdebug("auto collapse")
                             expandable.visible = false

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2014-03-27 23:33:35 +0000
+++ MusicaddtoPlaylist.qml	2014-03-28 16:22:04 +0000
@@ -86,8 +86,8 @@
                                                 chosenElement.album,
                                                 chosenElement.cover,
                                                 "","","","")
-                        var count = Playlists.getPlaylistCount(name) // get the new count
-                        playlistModel.model.set(index, {"count": count.toString()}) // update number ot tracks in playlist
+                        count = Playlists.getPlaylistCount(name) // get the new count
+                        playlistModel.model.set(index, {"count": count}) // update number ot tracks in playlist
                         onDoneClicked: PopupUtils.close(addtoPlaylist)
                     }
 

=== modified file 'music-app.qml'
--- music-app.qml	2014-03-28 01:00:11 +0000
+++ music-app.qml	2014-03-28 16:22:04 +0000
@@ -1104,7 +1104,7 @@
             // Set the models in the tab to allow/disallow loading
             function allowLoading(tabToLoad, state)
             {
-                if (tabToLoad.model !== undefined)
+                if (tabToLoad !== undefined && tabToLoad.model !== undefined)
                 {
                     for (var i=0; i < tabToLoad.model.length; i++)
                     {

=== modified file 'playlists.js'
--- playlists.js	2014-01-15 00:32:16 +0000
+++ playlists.js	2014-03-28 16:22:04 +0000
@@ -87,10 +87,9 @@
     try {
         db.transaction(function(tx) {
             // Get the maximum id for the playlist
-            var rs = tx.executeSql('SELECT MAX(id) FROM playlist WHERE playlist=?;',[playlist]);
-
+            var rs = tx.executeSql('SELECT id FROM playlist ORDER BY id DESC LIMIT 1');
             // Set res to max id or -1 if no ids exist
-            res = rs.rows.length === 0 ? -1 : rs.rows.item(0).id;
+            if (rs.rows.length > 0) res = rs.rows.item(0).id;
        })
     } catch(e) {
         return res;