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

[Victor Thompson]

Trigger list reset animation when the index did not change.

Trigger list reset animation when the index did not change.

Note: this was manually merged/reimplemented because the logic for reordering was relocated from where it was in trunk.

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

PASSED: Continuous integration, rev:843
http://91.189.93.70:8080/job/music-app-refactor-ci/45/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2267
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/3
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/45

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml	2015-02-22 02:24:16 +0000
+++ app/components/ListItemReorderComponent.qml	2015-03-06 02:40:38 +0000
@@ -64,21 +64,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)
             }