diff --git a/ionic/animations/animation.js b/ionic/animations/animation.js index 52150fd653..12b472d3b7 100644 --- a/ionic/animations/animation.js +++ b/ionic/animations/animation.js @@ -466,50 +466,52 @@ const ANIMATE_PROPERTIES = TRANSFORMS.concat('opacity'); // http://robertpenner.com/easing/ const CUBIC_BEZIERS = { - ease: '0.25, 0.1, 0.25, 1.0', - easeIn: '0.42, 0, 1.0, 1.0', - easeOut: '0, 0, 0.58, 1.0', - easeInOut: '0.42, 0, 0.58, 1.0', + + // default browser suppored easing + // ease + // ease-in + // ease-out + // ease-in-out // Cubic - easeInCubic: '0.55,0.055,0.675,0.19', - easeOutCubic: '0.215,0.61,0.355,1', - easeInOutCubic: '0.645,0.045,0.355,1', + 'ease-in-cubic': '0.55,0.055,0.675,0.19', + 'ease-out-cubic': '0.215,0.61,0.355,1', + 'ease-in-Out-cubic': '0.645,0.045,0.355,1', // Circ - easeInCirc: '0.6,0.04,0.98,0.335', - easeOutCirc: '0.075,0.82,0.165,1', - easeInOutCirc: '0.785,0.135,0.15,0.86', + 'ease-in-circ': '0.6,0.04,0.98,0.335', + 'ease-out-circ': '0.075,0.82,0.165,1', + 'ease-in-out-circ': '0.785,0.135,0.15,0.86', // Expo - easeInExpo: '0.95,0.05,0.795,0.035', - easeOutExpo: '0.19,1,0.22,1', - easeInOutExpo: '1,0,0,1', + 'ease-in-expo': '0.95,0.05,0.795,0.035', + 'ease-out-expo': '0.19,1,0.22,1', + 'ease-in-out-expo': '1,0,0,1', // Quad - easeInQuad: '0.55,0.085,0.68,0.53', - easeOutQuad: '0.25,0.46,0.45,0.94', - easeInOutQuad: '0.455,0.03,0.515,0.955', + 'ease-in-quad': '0.55,0.085,0.68,0.53', + 'ease-out-quad': '0.25,0.46,0.45,0.94', + 'ease-in-out-quad': '0.455,0.03,0.515,0.955', // Quart - easeInQuart: '0.895,0.03,0.685,0.22', - easeOutQuart: '0.165,0.84,0.44,1', - easeInOutQuart: '0.77,0,0.175,1', + 'ease-in-quart': '0.895,0.03,0.685,0.22', + 'ease-out-quart': '0.165,0.84,0.44,1', + 'ease-in-out-quart': '0.77,0,0.175,1', // Quint - easeInQuint: '0.755,0.05,0.855,0.06', - easeOutQuint: '0.23,1,0.32,1', - easeInOutQuint: '0.86,0,0.07,1', + 'ease-in-quint': '0.755,0.05,0.855,0.06', + 'ease-out-quint': '0.23,1,0.32,1', + 'ease-in-out-quint': '0.86,0,0.07,1', // Sine - easeInSine: '0.47,0,0.745,0.715', - easeOutSine: '0.39,0.575,0.565,1', - easeInOutSine : '0.445,0.05,0.55,0.95', + 'ease-in-sine': '0.47,0,0.745,0.715', + 'ease-out-sine': '0.39,0.575,0.565,1', + 'ease-in-out-sine': '0.445,0.05,0.55,0.95', // Back - easeInBack: '0.6,-0.28,0.735,0.045', - easeOutBack: '0.175, 0.885,0.32,1.275', - easeInOutBack: '0.68,-0.55,0.265,1.55', + 'ease-in-back': '0.6,-0.28,0.735,0.045', + 'ease-out-back': '0.175, 0.885,0.32,1.275', + 'ease-in-out-back': '0.68,-0.55,0.265,1.55', }; diff --git a/ionic/animations/builtins.js b/ionic/animations/builtins.js index edd96c319f..f1c3f222e5 100644 --- a/ionic/animations/builtins.js +++ b/ionic/animations/builtins.js @@ -6,7 +6,7 @@ class SlideIn extends Animation { constructor(element) { super(element); this - .easing('cubic-bezier(0.1, 0.7, 0.1, 1)') + .easing('cubic-bezier(0.1,0.7,0.1,1)') .duration(400) .from('translateY', '100%') .to('translateY', '0%'); @@ -19,7 +19,7 @@ class SlideOut extends Animation { constructor(element) { super(element); this - .easing('easeInOut') + .easing('ease-out') .duration(250) .from('translateY', '0%') .to('translateY', '100%'); diff --git a/ionic/ionic.js b/ionic/ionic.js index 1b03640339..f46399a914 100644 --- a/ionic/ionic.js +++ b/ionic/ionic.js @@ -1,13 +1,4 @@ -// Object.defineProperties(ViewContainerRef.prototype, { -// domElement: { -// get: function() { -// return this._defaultProtoView.render.delegate.element; -// } -// } -// }); - - export * from 'ionic/components' export * from 'ionic/directives' export * from 'ionic/platform/platform'