Merge pull request #89 from thgreasi/angular1.2

thgreasi · thgreasi · commit 409f6bc7ba81 · 2013-12-29T08:19:46.000-08:00
Restoring ngRepeat's elements (and comments) when no sorting occured.
diff --git a/src/sortable.js b/src/sortable.js
@@ -139,6 +139,12 @@ angular.module('ui.sortable', [])
                     ui.item.sortable.dropindex, 0,
                     ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0]);
                 });
+              } else {
+                // if the item was not moved, then restore the elements
+                // so that the ngRepeat's comment are correct.
+                if(!('dropindex' in ui.item.sortable) || ui.item.sortable.isCanceled()) {
+                  savedNodes.detach().appendTo(element);
+                }
               }
             };
 
diff --git a/test/sortable.spec.js b/test/sortable.spec.js
@@ -10,6 +10,12 @@ describe('uiSortable', function() {
           return list.children().map(function(){ return this.innerHTML; }).toArray();
         }
         return [];
+      },
+      toEqualListInnerContent: function (list) {
+        if (list && list.length) {
+          return list.children().map(function(){ return $(this).find('.itemContent').html(); }).toArray();
+        }
+        return [];
       }
     });
   });
@@ -230,6 +236,116 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should work when "handle" option is used', function() {
+      inject(function($compile, $rootScope) {
+        var element, logsElement;
+        element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}"><span class="handle">H</span> <span class="itemContent">{{ item }}</span></li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            handle: '.handle'
+          };
+          $rootScope.items = ["One", "Two", "Three"];
+        });
+
+        host.append(element);
+
+        var li = element.find('li:eq(1)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.find('.handle').simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Three", "Two"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        li = element.find('li:eq(1)');
+        dy = -(1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.find('.handle').simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Three", "One", "Two"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        $(element).remove();
+      });
+    });
+
+    it('should properly remove elements after a sorting', function() {
+      inject(function($compile, $rootScope) {
+        var element, logsElement;
+        element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}"><span class="handle">H</span> <span class="itemContent">{{ item }}</span> <button type="button" class="removeButton" ng-click="remove(item, $index)">X</button></li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            handle: '.handle'
+          };
+          $rootScope.items = ["One", "Two", "Three"];
+
+          $rootScope.remove = function (item, itemIndex) {
+            $rootScope.items.splice(itemIndex, 1);
+          };
+        });
+
+        host.append(element);
+
+        var li = element.find('li:eq(1)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.find('.handle').simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Three", "Two"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        li = element.find('li:eq(1)');
+        li.find('.removeButton').click();
+        expect($rootScope.items).toEqual(["One", "Two"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        li = element.find('li:eq(0)');
+        dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.find('.handle').simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Two", "One"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        li = element.find('li:eq(0)');
+        li.find('.removeButton').click();
+        expect($rootScope.items).toEqual(["One"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        $(element).remove();
+      });
+    });
+
+    it('should properly remove elements after a drag is reverted', function() {
+      inject(function($compile, $rootScope) {
+        var element, logsElement;
+        element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}"><span class="handle">H</span> <span class="itemContent">{{ item }}</span> <button type="button" class="removeButton" ng-click="remove(item, $index)">X</button></li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            handle: '.handle'
+          };
+          $rootScope.items = ["One", "Two", "Three"];
+
+          $rootScope.remove = function (item, itemIndex) {
+            $rootScope.items.splice(itemIndex, 1);
+          };
+        });
+
+        host.append(element);
+
+        var li = element.find('li:eq(0)');
+        var dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.find('.handle').simulate('dragAndRevert', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Two", "Three"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        li = element.find('li:eq(0)');
+        li.find('.removeButton').click();
+        expect($rootScope.items).toEqual(["Two", "Three"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        li = element.find('li:eq(0)');
+        dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.find('.handle').simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Three", "Two"]);
+        expect($rootScope.items).toEqualListInnerContent(element);
+
+        $(element).remove();
+      });
+    });
+
   });
 
   describe('Multiple sortables related', function() {
