fix(nav): rename animate to animated

Author: manucorporat

core/src/components/animation-controller/animator.tsx

@@ -702,11 +702,8 @@ export class Animator {
 
         } else if (tweenEffect) {
           // EVERYTHING IN BETWEEN
-          let valNum = (((toNum - fromNum) * stepValue) + fromNum);
+          const valNum = (((toNum - fromNum) * stepValue) + fromNum);
           const unit = fx.to.effectUnit;
-          if (unit === 'px') {
-            valNum = valNum;
-          }
           val = valNum + unit;
         }
 
@@ -819,7 +816,6 @@ export class Animator {
     const addClasses = this._beforeAddClasses;
     const removeClasses = this._beforeRemoveClasses;
 
-    let prop: string;
     for (let i = 0; i < elements.length; i++) {
       const el = elements[i];
       const elementClassList = el.classList;
@@ -834,6 +830,7 @@ export class Animator {
 
       // css classes to remove before the animation
       if (removeClasses) {
+
         for (let j = 0; j < removeClasses.length; j++) {
           // ******** DOM WRITE ****************
           elementClassList.remove(removeClasses[j]);
@@ -842,7 +839,7 @@ export class Animator {
 
       // inline styles to add before the animation
       if (this._beforeStyles) {
-        for (prop in this._beforeStyles) {
+        for (const prop in this._beforeStyles) {
           // ******** DOM WRITE ****************
           (el as any).style[prop] = this._beforeStyles[prop];
         }
@@ -919,24 +916,27 @@ export class Animator {
         // finished in reverse direction
 
         // css classes that were added before the animation should be removed
-        if (this._beforeAddClasses) {
-          for (j = 0; j < this._beforeAddClasses.length; j++) {
+        const beforeAddClasses = this._beforeAddClasses;
+        if (beforeAddClasses) {
+          for (j = 0; j < beforeAddClasses.length; j++) {
             // ******** DOM WRITE ****************
-            elementClassList.remove(this._beforeAddClasses[j]);
+            elementClassList.remove(beforeAddClasses[j]);
           }
         }
 
         // css classes that were removed before the animation should be added
-        if (this._beforeRemoveClasses) {
-          for (j = 0; j < this._beforeRemoveClasses.length; j++) {
+        const beforeRemoveClasses = this._beforeRemoveClasses;
+        if (beforeRemoveClasses) {
+          for (j = 0; j < beforeRemoveClasses.length; j++) {
             // ******** DOM WRITE ****************
-            elementClassList.add(this._beforeRemoveClasses[j]);
+            elementClassList.add(beforeRemoveClasses[j]);
           }
         }
 
         // inline styles that were added before the animation should be removed
-        if (this._beforeStyles) {
-          for (prop in this._beforeStyles) {
+        const beforeStyles = this._beforeStyles;
+        if (beforeStyles) {
+          for (prop in beforeStyles) {
             // ******** DOM WRITE ****************
             (el as any).style[prop] = '';
           }
@@ -946,26 +946,29 @@ export class Animator {
         // finished in forward direction
 
         // css classes to add after the animation
-        if (this._afterAddClasses) {
-          for (j = 0; j < this._afterAddClasses.length; j++) {
+        const afterAddClasses = this._afterAddClasses;
+        if (afterAddClasses) {
+          for (j = 0; j < afterAddClasses.length; j++) {
             // ******** DOM WRITE ****************
-            elementClassList.add(this._afterAddClasses[j]);
+            elementClassList.add(afterAddClasses[j]);
           }
         }
 
         // css classes to remove after the animation
-        if (this._afterRemoveClasses) {
-          for (j = 0; j < this._afterRemoveClasses.length; j++) {
+        const afterRemoveClasses = this._afterRemoveClasses;
+        if (afterRemoveClasses) {
+          for (j = 0; j < afterRemoveClasses.length; j++) {
             // ******** DOM WRITE ****************
-            elementClassList.remove(this._afterRemoveClasses[j]);
+            elementClassList.remove(afterRemoveClasses[j]);
           }
         }
 
         // inline styles to add after the animation
-        if (this._afterStyles) {
-          for (prop in this._afterStyles) {
+        const afterStyles = this._afterStyles;
+        if (afterStyles) {
+          for (prop in afterStyles) {
             // ******** DOM WRITE ****************
-            (el as any).style[prop] = this._afterStyles[prop];
+            (el as any).style[prop] = afterStyles[prop];
           }
         }
       }

core/src/components/datetime/datetime.tsx

@@ -274,15 +274,6 @@ export class Datetime {
 
     const picker = this.pickerCtrl.create(pickerOptions);
 
-    // picker.ionChange.subscribe(() => {
-    //   this.validate();
-    //   picker.refresh();
-    // });
-
-    // picker.onDidDismiss(() => {
-    //   this._fireBlur();
-    // });
-
     console.debug('Built Datetime: Picker with', pickerOptions);
     return picker;
   }

core/src/components/gesture-controller/test/gesture-controller.spec.tsx

@@ -1,6 +1,7 @@
 import { GestureController, } from '../gesture-controller';
 
 describe('gesture controller', () => {
+
   it('should create an instance of GestureController', () => {
     const c = new GestureController();
     expect(c.isCaptured()).toEqual(false);

core/src/components/nav/nav-interface.ts

@@ -16,7 +16,7 @@ export interface NavResult {
 }
 
 export interface RouterOutletOptions {
-  animate?: boolean;
+  animated?: boolean;
   animationBuilder?: AnimationBuilder;
   duration?: number;
   easing?: string;

core/src/components/nav/nav.tsx

@@ -154,8 +154,8 @@ export class Nav implements NavOutlet {
       opts = {};
     }
     // if animation wasn't set to true then default it to NOT animate
-    if (opts.animate !== true) {
-      opts.animate = false;
+    if (opts.animated !== true) {
+      opts.animated = false;
     }
     return this.queueTrns({
       insertStart: 0,
@@ -199,7 +199,7 @@ export class Nav implements NavOutlet {
     } else if (direction === 1) {
       finish = this.push(id, params, commonOpts);
     } else if (direction === -1) {
-      finish = this.setRoot(id, params, {...commonOpts, direction: 'back', animate: true});
+      finish = this.setRoot(id, params, {...commonOpts, direction: 'back', animated: true});
     } else {
       finish = this.setRoot(id, params, commonOpts);
     }
@@ -559,7 +559,7 @@ export class Nav implements NavOutlet {
     const leavingEl = leavingView && leavingView.element!;
     const animationOpts: TransitionOptions = {
       mode: this.mode,
-      animate: this.animated,
+      animated: this.animated,
       showGoBack: this.canGoBack(enteringView),
       animationCtrl: this.animationCtrl,
       progressCallback,