Browse Source

Merge branch 'touch-action'

pull/991/merge
Lebedev Konstantin 8 years ago
parent
commit
e91fa29f3a
  1. 14
      Sortable.js

14
Sortable.js

@ -67,7 +67,7 @@
$ = win.jQuery || win.Zepto, $ = win.jQuery || win.Zepto,
Polymer = win.Polymer, Polymer = win.Polymer,
captureMode = {capture: false, passive: false}, captureMode = false,
supportDraggable = !!('draggable' in document.createElement('div')), supportDraggable = !!('draggable' in document.createElement('div')),
supportCssPointerEvents = (function (el) { supportCssPointerEvents = (function (el) {
@ -231,7 +231,6 @@
// Export instance // Export instance
el[expando] = this; el[expando] = this;
// Default options // Default options
var defaults = { var defaults = {
group: Math.random(), group: Math.random(),
@ -1393,6 +1392,17 @@
); );
} }
try {
window.addEventListener('test', null, Object.defineProperty({}, 'passive', {
get: function () {
captureMode = {
capture: false,
passive: false
};
}
}));
} catch (err) {}
// Export utils // Export utils
Sortable.utils = { Sortable.utils = {
on: _on, on: _on,

Loading…
Cancel
Save