Merge pull request #125 from lukasoppermann/fix-handles

fixing handles to work

Author: Lukas Oppermann

src/html.sortable.src.js

@@ -132,7 +132,7 @@ var _destroySortable = function(sortable) {
   _removeSortableEvents(sortable);
   _removeSortableData(sortable);
   // remove event handlers & data from items
-  handles.off('selectstart.h5s');
+  handles.off('mousedown.h5s');
   _removeItemEvents(items);
   _removeItemData(items);
 };
@@ -143,8 +143,19 @@ var _destroySortable = function(sortable) {
 var _enableSortable = function(sortable) {
   var opts = sortable.data('opts');
   var items = sortable.children(opts.items);
+  var handles = opts.handle ? items.find(opts.handle) : items;
   sortable.attr('aria-dropeffect', 'move');
-  items.attr('draggable', true);
+  handles.attr('draggable', 'true');
+  // IE FIX for ghost
+  if (typeof document.createElement('span').dragDrop === 'function') {
+    handles.on('mousedown.h5s', function() {
+      if (items.index(this) !== -1) {
+        this.dragDrop();
+      } else {
+        $(this).parents(opts.items)[0].dragDrop();
+      }
+    });
+  }
 };
 /*
  * public sortable object
@@ -175,7 +186,6 @@ var sortable = function(options) {
 
     var index;
     var items = $sortable.children(options.items);
-    var handles = options.handle ? items.find(options.handle) : items;
 
     if (method === 'reload') {
       // remove event handlers from items
@@ -216,18 +226,6 @@ var sortable = function(options) {
     items.attr('role', 'option');
     items.attr('aria-grabbed', 'false');
 
-    // Setup drag handles
-    handles.attr('draggable', 'true');
-    // IE FIX for ghost
-    if (typeof document.createElement('span').dragDrop === 'function') {
-      handles.on('mousedown', function() {
-        if (items.index(this) !== -1) {
-          this.dragDrop();
-        } else {
-          $(this).parents(options.items)[0].dragDrop();
-        }
-      });
-    }
     // Handle drag events on draggable items
     items.on('dragstart.h5s', function(e) {
       e.stopImmediatePropagation();

test/internal.js

@@ -93,7 +93,7 @@ describe('internal function tests', function(){
       assert.isFalse(jQuery._data($li[0], 'events').hasOwnProperty('drop'));
       assert.isFalse(jQuery._data($li[0], 'events').hasOwnProperty('dragstart'));
       assert.isFalse(jQuery._data($li[0], 'events').hasOwnProperty('dragend'));
-      assert.isFalse(jQuery._data($li[0], 'events').hasOwnProperty('selectstart'));
+      assert.isFalse(jQuery._data($li[0], 'events').hasOwnProperty('mousedown'));
     });
 
     it('should remove data from sortable', function(){
@@ -118,11 +118,11 @@ describe('internal function tests', function(){
         items: 'li',
         connectWith: '.test'
       });
-      sortable.__testing._removeItemData($ul);
-
-      assert.isUndefined($ul.attr('role'));
-      assert.isUndefined($ul.attr('draggable'));
-      assert.isUndefined($ul.attr('aria-grabbed'));
+      sortable.__testing._removeItemData($ul.find('li'));
+      var li = $ul.find('li').first();
+      assert.isUndefined(li.attr('role'));
+      assert.isUndefined(li.attr('draggable'));
+      assert.isUndefined(li.attr('aria-grabbed'));
     });
 
   });