fix(di): update dependency injection and default configs

Author: adamdbradley

src/animations/animation.ts

@@ -1065,24 +1065,6 @@ export class Animation {
     return (this._twn && this._hasDur && this._eL ? this._e[0] : null);
   }
 
-
-  // ***** STATIC CLASSES *********
-
-  static create(name: string, opts: AnimationOptions = {}): Animation {
-    let AnimationClass = AnimationRegistry[name];
-
-    if (!AnimationClass) {
-      // couldn't find an animation by the given name
-      // fallback to just the base Animation class
-      AnimationClass = Animation;
-    }
-    return new AnimationClass(null, opts);
-  }
-
-  static register(name: string, AnimationClass: any) {
-    AnimationRegistry[name] = AnimationClass;
-  }
-
 }
 
 export interface AnimationOptions {
@@ -1115,7 +1097,6 @@ const TRANSFORMS: {[key: string]: number} = {
   'translateX': 1, 'translateY': 1, 'translateZ': 1, 'scale': 1, 'scaleX': 1, 'scaleY': 1, 'scaleZ': 1, 'rotate': 1, 'rotateX': 1, 'rotateY': 1, 'rotateZ': 1, 'skewX': 1, 'skewY': 1, 'perspective': 1
 };
 
-const AnimationRegistry: {[key: string]: any} = {};
 const CSS_VALUE_REGEX = /(^-?\d*\.?\d*)(.*)/;
 const ANIMATION_DURATION_MIN = 32;
 const TRANSITION_END_FALLBACK_PADDING_MS = 400;

src/components/action-sheet/action-sheet-component.ts

@@ -170,93 +170,4 @@ export class ActionSheetCmp {
   }
 }
 
-
-class ActionSheetSlideIn extends Transition {
-  init() {
-    let ele = this.enteringView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
-
-    backdrop.fromTo('opacity', 0.01, 0.4);
-    wrapper.fromTo('translateY', '100%', '0%');
-
-    this.easing('cubic-bezier(.36,.66,.04,1)').duration(400).add(backdrop).add(wrapper);
-  }
-}
-Transition.register('action-sheet-slide-in', ActionSheetSlideIn);
-
-
-class ActionSheetSlideOut extends Transition {
-  init() {
-    let ele = this.leavingView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
-
-    backdrop.fromTo('opacity', 0.4, 0);
-    wrapper.fromTo('translateY', '0%', '100%');
-
-    this.easing('cubic-bezier(.36,.66,.04,1)').duration(300).add(backdrop).add(wrapper);
-  }
-}
-Transition.register('action-sheet-slide-out', ActionSheetSlideOut);
-
-
-class ActionSheetMdSlideIn extends Transition {
-  init() {
-    let ele = this.enteringView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
-
-    backdrop.fromTo('opacity', 0.01, 0.26);
-    wrapper.fromTo('translateY', '100%', '0%');
-
-    this.easing('cubic-bezier(.36,.66,.04,1)').duration(400).add(backdrop).add(wrapper);
-  }
-}
-Transition.register('action-sheet-md-slide-in', ActionSheetMdSlideIn);
-
-
-class ActionSheetMdSlideOut extends Transition {
-  init() {
-    let ele = this.leavingView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
-
-    backdrop.fromTo('opacity', 0.26, 0);
-    wrapper.fromTo('translateY', '0%', '100%');
-
-    this.easing('cubic-bezier(.36,.66,.04,1)').duration(450).add(backdrop).add(wrapper);
-  }
-}
-Transition.register('action-sheet-md-slide-out', ActionSheetMdSlideOut);
-
-class ActionSheetWpSlideIn extends Transition {
-  init() {
-    let ele = this.enteringView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
-
-    backdrop.fromTo('opacity', 0.01, 0.16);
-    wrapper.fromTo('translateY', '100%', '0%');
-
-    this.easing('cubic-bezier(.36,.66,.04,1)').duration(400).add(backdrop).add(wrapper);
-  }
-}
-Transition.register('action-sheet-wp-slide-in', ActionSheetWpSlideIn);
-
-
-class ActionSheetWpSlideOut extends Transition {
-  init() {
-    let ele = this.leavingView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
-
-    backdrop.fromTo('opacity', 0.1, 0);
-    wrapper.fromTo('translateY', '0%', '100%');
-
-    this.easing('cubic-bezier(.36,.66,.04,1)').duration(450).add(backdrop).add(wrapper);
-  }
-}
-Transition.register('action-sheet-wp-slide-out', ActionSheetWpSlideOut);
-
 let actionSheetIds = -1;

src/components/action-sheet/action-sheet-transitions.ts

@@ -0,0 +1,86 @@
+import { Animation } from '../../animations/animation';
+import { Transition } from '../../transitions/transition';
+
+
+export class ActionSheetSlideIn extends Transition {
+  init() {
+    let ele = this.enteringView.pageRef().nativeElement;
+    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
+    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
+
+    backdrop.fromTo('opacity', 0.01, 0.4);
+    wrapper.fromTo('translateY', '100%', '0%');
+
+    this.easing('cubic-bezier(.36,.66,.04,1)').duration(400).add(backdrop).add(wrapper);
+  }
+}
+
+
+export class ActionSheetSlideOut extends Transition {
+  init() {
+    let ele = this.leavingView.pageRef().nativeElement;
+    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
+    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
+
+    backdrop.fromTo('opacity', 0.4, 0);
+    wrapper.fromTo('translateY', '0%', '100%');
+
+    this.easing('cubic-bezier(.36,.66,.04,1)').duration(300).add(backdrop).add(wrapper);
+  }
+}
+
+
+export class ActionSheetMdSlideIn extends Transition {
+  init() {
+    let ele = this.enteringView.pageRef().nativeElement;
+    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
+    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
+
+    backdrop.fromTo('opacity', 0.01, 0.26);
+    wrapper.fromTo('translateY', '100%', '0%');
+
+    this.easing('cubic-bezier(.36,.66,.04,1)').duration(400).add(backdrop).add(wrapper);
+  }
+}
+
+
+export class ActionSheetMdSlideOut extends Transition {
+  init() {
+    let ele = this.leavingView.pageRef().nativeElement;
+    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
+    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
+
+    backdrop.fromTo('opacity', 0.26, 0);
+    wrapper.fromTo('translateY', '0%', '100%');
+
+    this.easing('cubic-bezier(.36,.66,.04,1)').duration(450).add(backdrop).add(wrapper);
+  }
+}
+
+
+export class ActionSheetWpSlideIn extends Transition {
+  init() {
+    let ele = this.enteringView.pageRef().nativeElement;
+    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
+    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
+
+    backdrop.fromTo('opacity', 0.01, 0.16);
+    wrapper.fromTo('translateY', '100%', '0%');
+
+    this.easing('cubic-bezier(.36,.66,.04,1)').duration(400).add(backdrop).add(wrapper);
+  }
+}
+
+
+export class ActionSheetWpSlideOut extends Transition {
+  init() {
+    let ele = this.leavingView.pageRef().nativeElement;
+    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
+    let wrapper = new Animation(ele.querySelector('.action-sheet-wrapper'));
+
+    backdrop.fromTo('opacity', 0.1, 0);
+    wrapper.fromTo('translateY', '0%', '100%');
+
+    this.easing('cubic-bezier(.36,.66,.04,1)').duration(450).add(backdrop).add(wrapper);
+  }
+}

src/components/alert/alert-component.ts

@@ -1,11 +1,9 @@
 import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from '@angular/core';
 
-import { Animation } from '../../animations/animation';
 import { Config } from '../../config/config';
 import { isPresent } from '../../util/util';
 import { Key } from '../../util/key';
 import { NavParams } from '../../navigation/nav-params';
-import { Transition } from '../../transitions/transition';
 import { ViewController } from '../../navigation/view-controller';
 
 
@@ -288,121 +286,4 @@ export class AlertCmp {
   }
 }
 
-
-/**
- * Animations for alerts
- */
-class AlertPopIn extends Transition {
-  init() {
-    let ele = this.enteringView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.alert-wrapper'));
-
-    wrapper.fromTo('opacity', 0.01, 1).fromTo('scale', 1.1, 1);
-    backdrop.fromTo('opacity', 0.01, 0.3);
-
-    this
-      .easing('ease-in-out')
-      .duration(200)
-      .add(backdrop)
-      .add(wrapper);
-  }
-}
-Transition.register('alert-pop-in', AlertPopIn);
-
-
-class AlertPopOut extends Transition {
-  init() {
-    let ele = this.leavingView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.alert-wrapper'));
-
-    wrapper.fromTo('opacity', 0.99, 0).fromTo('scale', 1, 0.9);
-    backdrop.fromTo('opacity', 0.3, 0);
-
-    this
-      .easing('ease-in-out')
-      .duration(200)
-      .add(backdrop)
-      .add(wrapper);
-  }
-}
-Transition.register('alert-pop-out', AlertPopOut);
-
-
-class AlertMdPopIn extends Transition {
-  init() {
-    let ele = this.enteringView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.alert-wrapper'));
-
-    wrapper.fromTo('opacity', 0.01, 1).fromTo('scale', 1.1, 1);
-    backdrop.fromTo('opacity', 0.01, 0.5);
-
-    this
-      .easing('ease-in-out')
-      .duration(200)
-      .add(backdrop)
-      .add(wrapper);
-  }
-}
-Transition.register('alert-md-pop-in', AlertMdPopIn);
-
-
-class AlertMdPopOut extends Transition {
-  init() {
-    let ele = this.leavingView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.alert-wrapper'));
-
-    wrapper.fromTo('opacity', 0.99, 0).fromTo('scale', 1, 0.9);
-    backdrop.fromTo('opacity', 0.5, 0);
-
-    this
-      .easing('ease-in-out')
-      .duration(200)
-      .add(backdrop)
-      .add(wrapper);
-  }
-}
-Transition.register('alert-md-pop-out', AlertMdPopOut);
-
-
-class AlertWpPopIn extends Transition {
-  init() {
-    let ele = this.enteringView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.alert-wrapper'));
-
-    wrapper.fromTo('opacity', 0.01, 1).fromTo('scale', 1.3, 1);
-    backdrop.fromTo('opacity', 0.01, 0.5);
-
-    this
-      .easing('cubic-bezier(0,0 0.05,1)')
-      .duration(200)
-      .add(backdrop)
-      .add(wrapper);
-  }
-}
-Transition.register('alert-wp-pop-in', AlertWpPopIn);
-
-
-class AlertWpPopOut extends Transition {
-  init() {
-    let ele = this.leavingView.pageRef().nativeElement;
-    let backdrop = new Animation(ele.querySelector('ion-backdrop'));
-    let wrapper = new Animation(ele.querySelector('.alert-wrapper'));
-
-    wrapper.fromTo('opacity', 0.99, 0).fromTo('scale', 1, 1.3);
-    backdrop.fromTo('opacity', 0.5, 0);
-
-    this
-      .easing('ease-out')
-      .duration(150)
-      .add(backdrop)
-      .add(wrapper);
-  }
-}
-Transition.register('alert-wp-pop-out', AlertWpPopOut);
-
 let alertIds = -1;