Merge pull request #95 from thgreasi/angular1.2

Cherry picking ui-project changes & tests from master

Author: thgreasi

demo/demo.html

@@ -1,11 +1,11 @@
 <section ng-app="sortableApp" ng-controller="sortableController">
   <div class="row">
-    <div class="span6">
+    <div class="col-md-6">
       <ul ui-sortable="sortableOptions" ng-model="list" class="list">
         <li ng-repeat="item in list" class="item">{{item.text}}</li>
       </ul>
     </div>
-    <div class="span6">
+    <div class="col-md-6">
       <ul class="list logList">
         <li ng-repeat="entry in sortingLog" class="logItem">{{entry.Text}}</li>
       </ul>

publish.js

@@ -8,6 +8,7 @@ var path = require('path');
 module.exports = function() {
 
   var js_dependencies =[
+    'bower_components/jquery/jquery.js',
     'bower_components/jquery-ui/ui/jquery-ui.js'
   ];
 
@@ -25,7 +26,10 @@ module.exports = function() {
     inlineHTML : fs.readFileSync(__dirname + '/demo/demo.html'),
     inlineJS : fs.readFileSync(__dirname + '/demo/demo.js'),
     css: css_dependencies.map(putThemInVendorDir).concat(['demo/demo.css']),
-    js : js_dependencies.map(putThemInVendorDir).concat(['dist/sortable.js']),
+    js : function(defaultJsFiles){
+      // HACK TO LOAD JQUERY BEFORE ANGULAR
+      return ['vendor/jquery.js'].concat(defaultJsFiles, js_dependencies.slice(1).map(putThemInVendorDir).concat(['dist/sortable.js']));
+    },
     tocopy : css_dependencies.concat(js_dependencies)
   };
 };

test/sortable.spec.js

@@ -400,6 +400,42 @@ describe('uiSortable', function() {
       });
     });
 
+    it('should update model when sorting a "falsy" item between sortables', 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 = [0, 'Top Two', 'Top Three'];
+          $rootScope.itemsBottom = ['Bottom One', 'Bottom Two', 'Bottom Three'];
+          $rootScope.opts = { connectWith: '.cross-sortable' };
+        });
+
+        host.append(elementTop).append(elementBottom);
+
+        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', 0, 'Bottom Two', 'Bottom Three']);
+        expect($rootScope.itemsTop).toEqualListContent(elementTop);
+        expect($rootScope.itemsBottom).toEqualListContent(elementBottom);
+
+        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', 0, 'Top Three']);
+        expect($rootScope.itemsBottom).toEqual(['Bottom One', 'Bottom Two', 'Bottom Three']);
+        expect($rootScope.itemsTop).toEqualListContent(elementTop);
+        expect($rootScope.itemsBottom).toEqualListContent(elementBottom);
+
+        $(elementTop).remove();
+        $(elementBottom).remove();
+      });
+    });
+
     it('should work when "placeholder" option is used', function() {
       inject(function($compile, $rootScope) {
         var elementTop, elementBottom;