Merge pull request #60 from thgreasi/angular1.2

Progress on cancelling sort using multiple lists #30.

Author: thgreasi

src/sortable.js

@@ -108,7 +108,7 @@ angular.module('ui.sortable', [])
               // then we add the new item to this list otherwise wait until the
               // stop event where we will know if it was a sort or item was
               // moved here from another list
-              if(ui.item.sortable.received) {
+              if(ui.item.sortable.received && !ui.item.sortable.isCanceled()) {
                 scope.$apply(function () {
                   ngModel.$modelValue.splice(ui.item.sortable.dropindex, 0,
                                              ui.item.sortable.moved);
@@ -138,10 +138,12 @@ angular.module('ui.sortable', [])
             callbacks.remove = function(e, ui) {
               // Remove the item from this list's model and copy data into item,
               // so the next list can retrive it
-              scope.$apply(function () {
-                ui.item.sortable.moved = ngModel.$modelValue.splice(
-                  ui.item.sortable.index, 1)[0];
-              });
+              if (!ui.item.sortable.isCanceled()) {
+                scope.$apply(function () {
+                  ui.item.sortable.moved = ngModel.$modelValue.splice(
+                    ui.item.sortable.index, 1)[0];
+                });
+              }
             };
 
             scope.$watch(attrs.uiSortable, function(newVal, oldVal) {

test/sortable.spec.js

@@ -98,13 +98,11 @@ describe('uiSortable', function() {
         li.simulate('drag', { dy: dy });
         expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["One", "Three", "Four", "Two"]);
 
-        // fails on angular 1.2
         li = element.find(':eq(2)');
         dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
         li.simulate('drag', { dy: dy });
         expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "One", "Three", "Two"]);
 
-        // fails on angular 1.2
         li = element.find(':eq(3)');
         dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
         li.simulate('drag', { dy: dy });
@@ -129,15 +127,13 @@ describe('uiSortable', function() {
 
         host.append(elementTop).append(elementBottom);
 
-        // fails on angular 1.2
         var li1 = elementTop.find(':eq(0)');
         var li2 = elementBottom.find(':eq(0)');
         var dy = EXTRA_DY_PERCENTAGE * li1.outerHeight() + (li2.position().top - li1.position().top);
         li1.simulate('drag', { dy: dy });
         expect($rootScope.itemsTop).toEqual(["Top Two", "Top Three"]);
         expect($rootScope.itemsBottom).toEqual(["Bottom One", "Top One", "Bottom Two", "Bottom Three"]);
 
-        // fails on angular 1.2
         li1 = elementBottom.find(':eq(1)');
         li2 = elementTop.find(':eq(1)');
         dy = -EXTRA_DY_PERCENTAGE * li1.outerHeight() - (li1.position().top - li2.position().top);
@@ -194,10 +190,70 @@ describe('uiSortable', function() {
         li.simulate('drag', { dy: dy });
         expect($rootScope.items).toEqual(["Two", "Three", "One"]);
 
+        li = element.find(':eq(2)');
+        dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Two", "Three"]);
+
         $(element).remove();
       });
     });
 
+    it('should cancel sorting of nodes that contain "Two"', function() {
+      inject(function($compile, $rootScope) {
+        var elementTop, elementBottom;
+        elementTop = $compile('<ul ui-sortable="opts" class="cross-sortable" ng-model="itemsTop"><li ng-repeat="item in itemsTop" id="s-top-{{$index}}">{{ item }}</li></ul>')($rootScope);
+        elementBottom = $compile('<ul ui-sortable="opts" class="cross-sortable" ng-model="itemsBottom"><li ng-repeat="item in itemsBottom" id="s-bottom-{{$index}}">{{ item }}</li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.itemsTop = ["Top One", "Top Two", "Top Three"];
+          $rootScope.itemsBottom = ["Bottom One", "Bottom Two", "Bottom Three"];
+          $rootScope.opts = {
+            connectWith: ".cross-sortable",
+            update: function(e, ui) {
+              if (ui.item.scope() &&
+                (typeof ui.item.scope().item === 'string') &&
+                ui.item.scope().item.indexOf("Two") >= 0) {
+                ui.item.sortable.cancel();
+              }
+            }
+          };
+        });
+
+        host.append(elementTop).append(elementBottom);
+
+        var li1 = elementTop.find(':eq(1)');
+        var li2 = elementBottom.find(':eq(0)');
+        var dy = EXTRA_DY_PERCENTAGE * li1.outerHeight() + (li2.position().top - li1.position().top);
+        li1.simulate('drag', { dy: dy });
+        expect($rootScope.itemsTop).toEqual(["Top One", "Top Two", "Top Three"]);
+        expect($rootScope.itemsBottom).toEqual(["Bottom One", "Bottom Two", "Bottom Three"]);
+
+        li1 = elementBottom.find(':eq(1)');
+        li2 = elementTop.find(':eq(1)');
+        dy = -EXTRA_DY_PERCENTAGE * li1.outerHeight() - (li1.position().top - li2.position().top);
+        li1.simulate('drag', { dy: dy });
+        expect($rootScope.itemsTop).toEqual(["Top One", "Top Two", "Top Three"]);
+        expect($rootScope.itemsBottom).toEqual(["Bottom One", "Bottom Two", "Bottom Three"]);
+
+        li1 = elementTop.find(':eq(0)');
+        li2 = elementBottom.find(':eq(0)');
+        dy = EXTRA_DY_PERCENTAGE * li1.outerHeight() + (li2.position().top - li1.position().top);
+        li1.simulate('drag', { dy: dy });
+        expect($rootScope.itemsTop).toEqual(["Top Two", "Top Three"]);
+        expect($rootScope.itemsBottom).toEqual(["Bottom One", "Top One", "Bottom Two", "Bottom Three"]);
+
+        li1 = elementBottom.find(':eq(1)');
+        li2 = elementTop.find(':eq(1)');
+        dy = -EXTRA_DY_PERCENTAGE * li1.outerHeight() - (li1.position().top - li2.position().top);
+        li1.simulate('drag', { dy: dy });
+        expect($rootScope.itemsTop).toEqual(["Top Two", "Top One", "Top Three"]);
+        expect($rootScope.itemsBottom).toEqual(["Bottom One", "Bottom Two", "Bottom Three"]);
+
+        $(elementTop).remove();
+        $(elementBottom).remove();
+      });
+    });
+
     it('should update model from update() callback', function() {
       inject(function($compile, $rootScope) {
         var element, logsElement;