Provide a way to cancel a sorting.

Author: thgreasi

README.md

@@ -61,7 +61,7 @@ Inside the `update` callback, you can check the item that is dragged and cancel
 $scope.sortableOptions = {
   update: function(e, ui) {
     if (ui.item.scope().item == "can't be moved") {
-      ui.item.parent().sortable('cancel');
+      ui.item.sortable.cancel();
     }
   }
 };

src/sortable.js

@@ -48,7 +48,16 @@ angular.module('ui.sortable', [])
 
             callbacks.start = function(e, ui) {
               // Save the starting position of dragged item
-              ui.item.sortable = { index: ui.item.index() };
+              ui.item.sortable = {
+                index: ui.item.index(),
+                cancel: function () {
+                  ui.item.sortable._isCanceled = true;
+                },
+                isCanceled: function () {
+                  return ui.item.sortable._isCanceled;
+                },
+                _isCanceled: false
+              };
             };
 
             callbacks.activate = function(e, ui) {
@@ -111,7 +120,7 @@ angular.module('ui.sortable', [])
               // If the received flag hasn't be set on the item, this is a
               // normal sort, if dropindex is set, the item was moved, so move
               // the items in the list.
-              if(!ui.item.sortable.received && ('dropindex' in ui.item.sortable)) {
+              if(!ui.item.sortable.received && ('dropindex' in ui.item.sortable) && !ui.item.sortable.isCanceled()) {
                 scope.$apply(function () {
                   ngModel.$modelValue.splice(
                     ui.item.sortable.dropindex, 0,

test/sortable.spec.js

@@ -167,36 +167,36 @@ describe('uiSortable', function() {
       host = null;
     });
 
-    // it('should cancel sorting of node "Two"', function() {
-    //   inject(function($compile, $rootScope) {
-    //     var element;
-    //     element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
-    //     $rootScope.$apply(function() {
-    //       $rootScope.opts = {
-    //         update: function(e, ui) {
-    //           if (ui.item.scope().item === "Two") {
-    //             ui.item.parent().sortable('cancel');
-    //           }
-    //         }
-    //       };
-    //       $rootScope.items = ["One", "Two", "Three"];
-    //     });
-
-    //     host.append(element);
-
-    //     var li = element.find(':eq(1)');
-    //     var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
-    //     li.simulate('drag', { dy: dy });
-    //     expect($rootScope.items).toEqual(["One", "Two", "Three"]);
-
-    //     li = element.find(':eq(0)');
-    //     dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
-    //     li.simulate('drag', { dy: dy });
-    //     expect($rootScope.items).toEqual(["Two", "Three", "One"]);
-
-    //     $(element).remove();
-    //   });
-    // });
+    it('should cancel sorting of node "Two"', function() {
+      inject(function($compile, $rootScope) {
+        var element;
+        element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            update: function(e, ui) {
+              if (ui.item.scope().item === "Two") {
+                ui.item.sortable.cancel();
+              }
+            }
+          };
+          $rootScope.items = ["One", "Two", "Three"];
+        });
+
+        host.append(element);
+
+        var li = element.find(':eq(1)');
+        var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Two", "Three"]);
+
+        li = element.find(':eq(0)');
+        dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Two", "Three", "One"]);
+
+        $(element).remove();
+      });
+    });
 
     it('should update model from update() callback', function() {
       inject(function($compile, $rootScope) {