Merge pull request #80 from thgreasi/angular1.2

Testing if sortable works after a reverted (not dropped) drag.
As per the case mentioned in #61 by @bcronje..

Author: thgreasi

gruntFile.js

@@ -26,7 +26,7 @@ module.exports = function(grunt) {
       }
     },
     jshint: {
-      files: ['src/**/*.js', 'test/**/*.js', 'demo/**/*.js'],
+      files: ['src/**/*.js', 'test/**/*.js', 'demo/**/*.js', '!test/libs/*.js'],
       options: {
         curly: true,
         eqeqeq: true,

test/libs/jquery.simulate.dragandrevert.js

@@ -0,0 +1,60 @@
+;(function($, undefined) {
+	function findCenter(elem) {
+		var offset,
+			document = $(elem.ownerDocument);
+		elem = $(elem);
+		offset = elem.offset();
+
+		return {
+			x: offset.left + elem.outerWidth() / 2 - document.scrollLeft(),
+			y: offset.top + elem.outerHeight() / 2 - document.scrollTop()
+		};
+	}
+
+	$.extend($.simulate.prototype, {
+		simulateDragAndRevert: function() {
+			var i = 0,
+				target = this.target,
+				options = this.options,
+				center = findCenter(target),
+				x = Math.floor(center.x),
+				y = Math.floor(center.y),
+				dx = options.dx || 0,
+				dy = options.dy || 0,
+				moves = options.moves || 3,
+				coord = {
+					clientX: x,
+					clientY: y
+				};
+
+			this.simulateEvent(target, "mousedown", coord);
+
+			for (; i < moves; i++) {
+				x += dx / moves;
+				y += dy / moves;
+
+				coord = {
+					clientX: Math.round(x),
+					clientY: Math.round(y)
+				};
+
+				this.simulateEvent(document, "mousemove", coord);
+			}
+
+			for (i = 0; i < moves; i++) {
+				x -= dx / moves;
+				y -= dy / moves;
+
+				coord = {
+					clientX: Math.round(x),
+					clientY: Math.round(y)
+				};
+
+				this.simulateEvent(document, "mousemove", coord);
+			}
+
+			this.simulateEvent(target, "mouseup", coord);
+			this.simulateEvent(target, "click", coord);
+		}
+	});
+})(jQuery);

test/sortable.spec.js

@@ -189,6 +189,47 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should continue to work after a drag is reverted', function() {
+      inject(function($compile, $rootScope) {
+        var element;
+        element = $compile('<ul ui-sortable ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}" class="sortable-item">{{ item }}</li></ul>')($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.opts = {
+            placeholder: "sortable-item"
+          };
+          $rootScope.items = ["One", "Two", "Three"];
+        });
+
+        host.append(element);
+
+        var li = element.find(':eq(0)');
+        var dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('dragAndRevert', { dy: dy });
+        expect($rootScope.items).toEqual(["One", "Two", "Three"]);
+        expect($rootScope.items).toEqualListContent(element);
+
+        li = element.find(':eq(0)');
+        dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Two", "One", "Three"]);
+        expect($rootScope.items).toEqualListContent(element);
+
+        li = element.find(':eq(1)');
+        dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Two", "Three", "One"]);
+        expect($rootScope.items).toEqualListContent(element);
+
+        li = element.find(':eq(1)');
+        dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
+        li.simulate('drag', { dy: dy });
+        expect($rootScope.items).toEqual(["Two", "One", "Three"]);
+        expect($rootScope.items).toEqualListContent(element);
+
+        $(element).remove();
+      });
+    });
+
   });
 
   describe('Multiple sortables related', function() {

test/test.conf.js

@@ -4,6 +4,7 @@ files = [
   JASMINE_ADAPTER,
   'bower_components/jquery/jquery.js',
   'bower_components/jquery-simulate/jquery.simulate.js',
+  'test/libs/jquery.simulate.dragandrevert.js',
   'bower_components/jquery-ui/ui/jquery-ui.js',
   'bower_components/angular/angular.js',
   'bower_components/angular-mocks/angular-mocks.js',
@@ -13,9 +14,10 @@ files = [
 singleRun = true;
 autoWatch = false;
 browsers = [ 'Chrome' ];
+reporters = [ 'dots' ];
 
 if (singleRun) {
-	reporters = [ 'coverage' ];
+	reporters.push('coverage');
 	preprocessors = { '**/src/*.js': 'coverage' };
 	coverageReporter = {
 		type : 'html',