Skip to content

Commit 55e8cd2

Browse files
author
Jordan Davis
committed
prevent jumpy animation bug in slip.js, until better fix
1 parent 6ac1578 commit 55e8cd2

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

vendor/slip.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,7 @@ window['Slip'] = (function(){
304304
var move = this.getTotalMovement();
305305

306306
if (Math.abs(move.y) < this.target.height+20) {
307-
//console.log('set target4')
308-
window.test = this.target
309-
//console.log(this.target.node.getElementsByClassName('item-content'))
310-
this.target.node.getElementsByClassName('item-content')[0].style[transformPrefix] = 'translate(' + move.x + 'px,0) ' + hwLayerMagic + this.target.baseTransform.value;
307+
this.target.node.style[transformPrefix] = 'translate(' + move.x + 'px,0) ' + hwLayerMagic + this.target.baseTransform.value;
311308
return false;
312309
} else {
313310
this.setState(this.states.idle);
@@ -326,17 +323,16 @@ window['Slip'] = (function(){
326323
var move = this.getAbsoluteMovement();
327324
var swiped = velocity > 0.6 && move.time > 110;
328325

329-
var direction;
330-
if (dx > 0) {
331-
direction = "right";
332-
} else {
333-
direction = "left";
334-
}
326+
var direction;
327+
if (dx > 0) {
328+
direction = "right";
329+
} else {
330+
direction = "left";
331+
}
335332

336333
if (swiped) {
337334
if (this.dispatch(this.target.node, 'swipe', {direction: direction, originalIndex: originalIndex})) {
338335
swipeSuccess = true; // can't animate here, leaveState overrides anim
339-
console.log(direction)
340336
}
341337
}
342338
this.setState(this.states.idle);
@@ -744,9 +740,8 @@ window['Slip'] = (function(){
744740
animateToZero: function(callback, target) {
745741
// save, because this.target/container could change during animation
746742
target = target || this.target;
747-
//console.log('set target2')
748743

749-
target.node.style[transitionPrefix] = transformProperty + ' 0.1s ease-out';
744+
// target.node.style[transitionPrefix] = transformProperty + ' 5s ease-out';
750745
target.node.style[transformPrefix] = 'translate(0,0) ' + hwLayerMagic + target.baseTransform.value;
751746
setTimeout(function(){
752747
target.node.style[transitionPrefix] = '';
@@ -761,8 +756,6 @@ window['Slip'] = (function(){
761756
var emptySpaceTransform = 'translate(0,' + this.target.height + 'px) ' + hwLayerMagic + ' ';
762757

763758
// FIXME: animate with real velocity
764-
//console.log('set target')
765-
window.test = target
766759
target.node.style[transitionPrefix] = 'all 0.1s linear';
767760
target.node.style[transformPrefix] = ' translate(' + (this.getTotalMovement().x > 0 ? '' : '-') + '100%,0) ' + hwLayerMagic + target.baseTransform.value;
768761

@@ -774,7 +767,6 @@ window['Slip'] = (function(){
774767
});
775768
setTimeout(function(){
776769
siblings.forEach(function(o){
777-
//console.log('set target1')
778770
o.node.style[transitionPrefix] = transformProperty + ' 0.1s ease-in-out';
779771
o.node.style[transformPrefix] = 'translate(0,0) ' + hwLayerMagic + o.baseTransform.value;
780772
});

0 commit comments

Comments
 (0)