Skip to content

Commit 2f0e3a7

Browse files
committed
Merge pull request #157 from enyojs/ENYO-650-aarontam
ENYO-650: Tweak panel transitions Reviewed-By: Roy Sutton (roy.sutton@lge.com) Integrated-By: Ryan Duffy (ryan.duffy@lge.com)
2 parents 29b4ff9 + 15c98f4 commit 2f0e3a7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/Arranger/Arranger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ Arranger.positionControl = function (control, bounds, unit) {
372372
unit = unit || 'px';
373373
if (!this.updating) {
374374
// IE10 uses setBounds because of control hit caching problems seem in some apps
375-
if (Dom.canTransform() && !control.preventTransform && !platform.android && platform.ie !== 10) {
375+
if (Dom.canTransform() && !control.preventTransform && platform.ie !== 10) {
376376
var l = bounds.left, t = bounds.top;
377377
l = utils.isString(l) ? l : l && (l + unit);
378378
t = utils.isString(t) ? t : t && (t + unit);

src/Panels/Panels.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ var Panels = module.exports = kind(
502502
*/
503503
animationEnded: function (sender, event) {
504504
this.completed();
505+
return true;
505506
},
506507

507508
/**
@@ -540,6 +541,7 @@ var Panels = module.exports = kind(
540541
if (this.dragging) {
541542
event.preventDefault();
542543
this.dragTransition(event);
544+
return true;
543545
}
544546
},
545547

@@ -551,6 +553,7 @@ var Panels = module.exports = kind(
551553
this.dragging = false;
552554
event.preventTap();
553555
this.dragfinishTransition(event);
556+
return true;
554557
}
555558
},
556559

@@ -649,6 +652,7 @@ var Panels = module.exports = kind(
649652
this.stepTransition();
650653
this.transitioning = false;
651654
this.completeTransition();
655+
this.dragging = false;
652656
},
653657

654658
/**

0 commit comments

Comments
 (0)