Skip to content

Commit

Permalink
Merge pull request SortableJS#943 from FurnaceCMS/master
Browse files Browse the repository at this point in the history
Handles inside polymer elements
  • Loading branch information
RubaXa authored Sep 1, 2016
2 parents a4d5aa1 + 1e92db5 commit 887fe9d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions Sortable.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,9 @@
type = evt.type,
touch = evt.touches && evt.touches[0],
target = (touch || evt).target,
originalTarget = target,
originalTarget = evt.target.shadowRoot && evt.path[0] || target,
filter = options.filter;


if (type === 'mousedown' && evt.button !== 0 || options.disabled) {
return; // only left button or enabled
}
Expand Down Expand Up @@ -1003,13 +1002,15 @@
return el;
}
}
while (el !== ctx && (el = el.parentNode));
while (el = ('host' in el) ? el.host : el.parentNode)
}

return null;
}




function _globalDragOver(/**Event*/evt) {
if (evt.dataTransfer) {
evt.dataTransfer.dropEffect = 'move';
Expand Down
Loading

0 comments on commit 887fe9d

Please sign in to comment.