Browse Source

#166: fixed _onDragOver & group

pull/177/head
RubaXa 10 years ago
parent
commit
6656e45f30
  1. 13
      Sortable.js

13
Sortable.js

@ -105,7 +105,8 @@
dataTransfer.setData('Text', dragEl.textContent); dataTransfer.setData('Text', dragEl.textContent);
} }
}, },
group;
group = options.group;
// Set default options // Set default options
@ -114,10 +115,9 @@
} }
if (!options.group.name) { if (!group || typeof group != 'object') {
options.group = { name: options.group }; group = options.group = { name: group };
} }
group = options.group;
['pull', 'put'].forEach(function (key) { ['pull', 'put'].forEach(function (key) {
@ -450,7 +450,10 @@
isOwner = (activeGroup === group), isOwner = (activeGroup === group),
canSort = options.sort; canSort = options.sort;
(evt.stopPropagation !== void 0) && evt.stopPropagation(); if (evt.preventDefault !== void 0) {
evt.preventDefault();
evt.stopPropagation();
}
if (!_silent && activeGroup && if (!_silent && activeGroup &&
(isOwner (isOwner

Loading…
Cancel
Save