Merge lp:~vthompson/music-app/fix-1428913 into lp:music-app/remix

[Victor Thompson]

Trigger list reset animation when the index did not change.

Trigger list reset animation when the index did not change.

[lp:~vthompson/music-app/fix-1428913]

845. By Victor Thompson on 2015-03-06

remove added from property.

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

PASSED: Continuous integration, rev:845
http://91.189.93.70:8080/job/music-app-ci/1280/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2266
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/374
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/132

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-1428913]

846. By Victor Thompson on 2015-03-06

add new line

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

PASSED: Continuous integration, rev:846
http://91.189.93.70:8080/job/music-app-ci/1281/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2269
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2269/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/375
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/133

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	2015-01-18 00:06:06 +0000
+++ common/ListItemWithActions.qml	2015-03-06 02:43:07 +0000
@@ -544,21 +544,19 @@
 
                     root.parent.parent.interactive = true;  // reenable scrolling
 
-                    if (diff === 0) {
+                    var newIndex = index + diff;
+
+                    if (newIndex < 0) {
+                        newIndex = 0;
+                    } else if (newIndex > root.parent.parent.count - 1) {
+                        newIndex = root.parent.parent.count - 1;
+                    }
+
+                    if (index === newIndex) {
                         // Nothing has changed so reset the item
                         // z index is restored after animation
                         resetListItemYAnimation.start();
-                    }
-                    else {
-                        var newIndex = index + diff;
-
-                        if (newIndex < 0) {
-                            newIndex = 0;
-                        }
-                        else if (newIndex > root.parent.parent.count - 1) {
-                            newIndex = root.parent.parent.count - 1;
-                        }
-
+                    } else {
                         root.z -= 10;  // restore z index
                         reorder(index, newIndex)
                     }