github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix event handlers on items moved via animation

Browse Source
This commit is contained in:
Avital Oliver
2013-08-08 15:33:01 -07:00
parent 04dc8bd67e
commit 74232c0d7b
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/animation/animated_each.js
View File

@@ -94,7 +94,9 @@ var apply = function (el, events) {
// xcxc chained hooks?
$(el)[0].$uihooks = {};
if (_.contains(events, 'insert')) {
// xcxc make these events accept functions, so that we can not
// animate initial data but still animate subsequent inserts
if (_.contains(events, 'insert')) { // xcxc insert -> add
$(el)[0].$uihooks.insertElement = function (n, parent, next) {
runOrQueueIfMoving(function () {
var onComplete = dequeuePlanned ? null : dequeue;
@@ -120,13 +122,14 @@ var apply = function (el, events) {
runOrQueue(function () {
moveActive = true;
// - make an empty clone of `n` that will animate out of existence
// - make an empty clone of `n` that will animate out of
// - existence
//
// - make an empty clone of `n` that will animate into existence
// - at the desired new position
// - make an empty clone of `n` that will animate into
// - existence at the desired new position
//
// - give `n` absolute positioning, and move it to its desired
// - new position
// - give `n` absolute positioning, and animate it to its
// - desired new position
var $n = $(n);
var pos = $n.position();
@@ -147,13 +150,17 @@ var apply = function (el, events) {
parent.insertBefore(oldPositionPlaceholder[0], $n.next()[0]);
animateOut(oldPositionPlaceholder[0]);
// Move `n` in the DOM before starting the
// animation. Otherwise it won't become contained in the
// DomRange currently surrounding it.
parent.insertBefore(n, next);
$n.animate({
top: clonePos.top,
left: clonePos.left
}, function () {
newPositionPlaceholder.remove();
$n.removeAttr('style'); // xcxc we shouldn't clear all styles, only positioning
parent.insertBefore(n, next);
dequeue();
});
});