Browse Source

* merge: dev + master

pull/699/head
RubaXa 9 years ago
parent
commit
15e82b5ae8
  1. 3
      Sortable.js
  2. 2
      Sortable.min.js
  3. 4
      react-sortable-mixin.js

3
Sortable.js

@ -683,6 +683,9 @@
if (elTop === tgTop) { if (elTop === tgTop) {
after = (target.previousElementSibling === dragEl) && !isWide || halfway && isWide; after = (target.previousElementSibling === dragEl) && !isWide || halfway && isWide;
}
else if (target.previousElementSibling === dragEl || dragEl.previousElementSibling === target) {
after = (evt.clientY - targetRect.top) / height > 0.5;
} else { } else {
after = tgTop > elTop; after = tgTop > elTop;
} }

2
Sortable.min.js vendored

File diff suppressed because one or more lines are too long

4
react-sortable-mixin.js vendored

@ -85,8 +85,8 @@
copyOptions = _extend({}, options), copyOptions = _extend({}, options),
emitEvent = function (/** string */type, /** Event */evt) { emitEvent = function (/** string */type, /** Event */evt) {
var method = this[options[type]]; var method = options[type];
method && method.call(this, evt, this._sortableInstance); method && typeof method === "function" && method.call(this, evt, this._sortableInstance);
}.bind(this); }.bind(this);

Loading…
Cancel
Save