Browse Source

Merge pull request #943 from FurnaceCMS/master

Handles inside polymer elements
pull/924/merge 1.5.0-rc1
Lebedev Konstantin 8 years ago committed by GitHub
parent
commit
887fe9d489
  1. 7
      Sortable.js
  2. 2
      Sortable.min.js

7
Sortable.js

@ -262,10 +262,9 @@
type = evt.type, type = evt.type,
touch = evt.touches && evt.touches[0], touch = evt.touches && evt.touches[0],
target = (touch || evt).target, target = (touch || evt).target,
originalTarget = target, originalTarget = evt.target.shadowRoot && evt.path[0] || target,
filter = options.filter; filter = options.filter;
if (type === 'mousedown' && evt.button !== 0 || options.disabled) { if (type === 'mousedown' && evt.button !== 0 || options.disabled) {
return; // only left button or enabled return; // only left button or enabled
} }
@ -1003,13 +1002,15 @@
return el; return el;
} }
} }
while (el !== ctx && (el = el.parentNode)); while (el = ('host' in el) ? el.host : el.parentNode)
} }
return null; return null;
} }
function _globalDragOver(/**Event*/evt) { function _globalDragOver(/**Event*/evt) {
if (evt.dataTransfer) { if (evt.dataTransfer) {
evt.dataTransfer.dropEffect = 'move'; evt.dataTransfer.dropEffect = 'move';

2
Sortable.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save