|
@@ -451,22 +451,26 @@ var TimelineUtils = /*#__PURE__*/function () {
|
|
return to;
|
|
return to;
|
|
}
|
|
}
|
|
|
|
|
|
- var isFromMinNumber = TimelineUtils.isNumber(from.min);
|
|
|
|
- var isToMinNumber = TimelineUtils.isNumber(to.min); // get absolute min and max bounds:
|
|
|
|
|
|
+ var fromMin = Math.min(from.getMin ? from.getMin() : from.min, from.min);
|
|
|
|
+ var toMin = Math.min(to.getMin ? to.getMin() : to.min, to.min);
|
|
|
|
+ var isFromMinNumber = TimelineUtils.isNumber(fromMin);
|
|
|
|
+ var isToMinNumber = TimelineUtils.isNumber(toMin); // get absolute min and max bounds:
|
|
|
|
|
|
if (isFromMinNumber && isToMinNumber) {
|
|
if (isFromMinNumber && isToMinNumber) {
|
|
- to.min = shrink ? Math.min(from.min, to.min) : Math.max(from.min, to.min);
|
|
|
|
|
|
+ to.min = shrink ? Math.min(fromMin, toMin) : Math.max(fromMin, toMin);
|
|
} else if (isFromMinNumber) {
|
|
} else if (isFromMinNumber) {
|
|
- to.min = from.min;
|
|
|
|
|
|
+ to.min = fromMin;
|
|
}
|
|
}
|
|
|
|
|
|
- var isFromMaxNumber = TimelineUtils.isNumber(from.max);
|
|
|
|
- var isToMaxNumber = TimelineUtils.isNumber(to.max);
|
|
|
|
|
|
+ var fromMax = Math.min(from.getMax && from.getMax ? from.getMax() : from.max, from.max);
|
|
|
|
+ var toMax = Math.min(to.getMax ? to.getMax() : to.max, to.max);
|
|
|
|
+ var isFromMaxNumber = TimelineUtils.isNumber(fromMax);
|
|
|
|
+ var isToMaxNumber = TimelineUtils.isNumber(toMax);
|
|
|
|
|
|
if (isFromMaxNumber && isToMaxNumber) {
|
|
if (isFromMaxNumber && isToMaxNumber) {
|
|
- to.max = shrink ? Math.max(from.max, to.max) : Math.min(from.max, to.max);
|
|
|
|
|
|
+ to.max = shrink ? Math.max(fromMax, toMax) : Math.min(fromMax, toMax);
|
|
} else if (isFromMaxNumber) {
|
|
} else if (isFromMaxNumber) {
|
|
- to.max = from.max;
|
|
|
|
|
|
+ to.max = fromMax;
|
|
}
|
|
}
|
|
|
|
|
|
return to;
|
|
return to;
|