瀏覽代碼

lib is updated

Ievgen Naida 5 年之前
父節點
當前提交
e36dcebf6a
共有 3 個文件被更改,包括 12 次插入8 次删除
  1. 12 8
      lib/animation-timeline.js
  2. 0 0
      lib/animation-timeline.min.js
  3. 0 0
      lib/utils/timelineUtils.js.map

+ 12 - 8
lib/animation-timeline.js

@@ -451,22 +451,26 @@ var TimelineUtils = /*#__PURE__*/function () {
         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) {
-        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) {
-        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) {
-        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) {
-        to.max = from.max;
+        to.max = fromMax;
       }
 
       return to;

File diff suppressed because it is too large
+ 0 - 0
lib/animation-timeline.min.js


File diff suppressed because it is too large
+ 0 - 0
lib/utils/timelineUtils.js.map


Some files were not shown because too many files changed in this diff