rename some methods

visgl · Sep 19, 2019 · 385a7d9 · 385a7d9
1 parent 57db8f9
commit 385a7d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/modules/core/src/lib/attribute-transition-manager.js b/modules/core/src/lib/attribute-transition-manager.js
@@ -64,7 +64,8 @@ export default class AttributeTransitionManager {
 
   // Returns `true` if attribute is transition-enabled
   hasAttribute(attributeName) {
-    return attributeName in this.transitions;
+    const transition = this.transitions[attributeName];
+    return transition && transition.inProgress;
   }
 
   // Get all the animated attributes
@@ -73,8 +74,8 @@ export default class AttributeTransitionManager {
 
     for (const attributeName in this.transitions) {
       const transition = this.transitions[attributeName];
-      if (transition.isTransitioning()) {
-        animatedAttributes[attributeName] = transition.getAttribute();
+      if (transition.inProgress) {
+        animatedAttributes[attributeName] = transition.attributeInTransition;
       }
     }
 

diff --git a/modules/core/src/transitions/gpu-interpolation-transition.js b/modules/core/src/transitions/gpu-interpolation-transition.js
@@ -37,14 +37,10 @@ export default class GPUInterpolationTransition {
     ];
   }
 
-  isTransitioning() {
+  get inProgress() {
     return this.transition.inProgress;
   }
 
-  getAttribute() { 
-    return this.isTransitioning() ? this.attributeInTransition : this.attribute;
-  }
-
   // this is called when an attribute's values have changed and
   // we need to start animating towards the new values
   // this also correctly resizes / pads the transform's buffers

diff --git a/modules/core/src/transitions/gpu-spring-transition.js b/modules/core/src/transitions/gpu-spring-transition.js
@@ -41,14 +41,10 @@ export default class GPUSpringTransition {
     ];
   }
 
-  isTransitioning() {
+  get inProgress() {
     return this.transition.inProgress;
   }
 
-  getAttribute() { 
-    return this.isTransitioning() ? this.attributeInTransition : this.attribute;
-  }
-
   // this is called when an attribute's values have changed and
   // we need to start animating towards the new values
   // this also correctly resizes / pads the transform's buffers