|
|
@ -315,7 +315,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
rootEl = el; |
|
|
|
rootEl = el; |
|
|
|
dragEl = target; |
|
|
|
dragEl = target; |
|
|
|
parentEl = target.parentNode; |
|
|
|
parentEl = dragEl.parentNode; |
|
|
|
nextEl = dragEl.nextSibling; |
|
|
|
nextEl = dragEl.nextSibling; |
|
|
|
activeGroup = options.group; |
|
|
|
activeGroup = options.group; |
|
|
|
|
|
|
|
|
|
|
@ -609,11 +609,10 @@ |
|
|
|
) { |
|
|
|
) { |
|
|
|
|
|
|
|
|
|
|
|
if (target) { |
|
|
|
if (target) { |
|
|
|
parentEl = target.parentNode; // actualization
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (target.animated) { |
|
|
|
if (target.animated) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
targetRect = target.getBoundingClientRect(); |
|
|
|
targetRect = target.getBoundingClientRect(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -622,14 +621,14 @@ |
|
|
|
if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect) !== false) { |
|
|
|
if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect) !== false) { |
|
|
|
if (!dragEl.contains(el)) { |
|
|
|
if (!dragEl.contains(el)) { |
|
|
|
el.appendChild(dragEl); |
|
|
|
el.appendChild(dragEl); |
|
|
|
|
|
|
|
parentEl = el; // actualization
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this._animate(dragRect, dragEl); |
|
|
|
this._animate(dragRect, dragEl); |
|
|
|
target && this._animate(targetRect, target); |
|
|
|
target && this._animate(targetRect, target); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else if (target && !target.animated && target !== dragEl && (target.parentNode[expando] !== void 0)) { |
|
|
|
else if (target && !target.animated && target !== dragEl && (target.parentNode[expando] !== void 0)) { |
|
|
|
parentEl = target.parentNode; // actualization
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (lastEl !== target) { |
|
|
|
if (lastEl !== target) { |
|
|
|
lastEl = target; |
|
|
|
lastEl = target; |
|
|
|
lastCSS = _css(target); |
|
|
|
lastCSS = _css(target); |
|
|
@ -679,6 +678,8 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
parentEl = dragEl.parentNode; // actualization
|
|
|
|
|
|
|
|
|
|
|
|
this._animate(dragRect, dragEl); |
|
|
|
this._animate(dragRect, dragEl); |
|
|
|
this._animate(targetRect, target); |
|
|
|
this._animate(targetRect, target); |
|
|
|
} |
|
|
|
} |
|
|
|