From 49e1b2034221db3166a228c6bbc2946c93e4464a Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 28 Apr 2016 16:55:46 -0400 Subject: [PATCH] docs(config): update config with windows mode rearrange mode config so it is in alphabetical order references driftyco/ionic-site#585 --- ionic/config/config.ts | 46 +++++++++++++++++++++++++----------------- ionic/config/modes.ts | 18 ++++++++--------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/ionic/config/config.ts b/ionic/config/config.ts index 3ae34c824b5..880092d6b8f 100644 --- a/ionic/config/config.ts +++ b/ionic/config/config.ts @@ -83,25 +83,33 @@ import {isObject, isDefined, isFunction, isArray} from '../util/util'; * A config value can come from anywhere and be anything, but there are a default set of values. * * - * | Config property | Default iOS Value | Default MD Value | - * |----------------------------|------------------------|---------------------------| - * | activator | highlight | ripple | - * | actionSheetEnter | action-sheet-slide-in | action-sheet-md-slide-in | - * | actionSheetLeave | action-sheet-slide-out | action-sheet-md-slide-out | - * | alertEnter | alert-pop-in | alert-md-pop-in | - * | alertLeave | alert-pop-out | alert-md-pop-out | - * | backButtonText | Back | | - * | backButtonIcon | ion-ios-arrow-back | ion-md-arrow-back | - * | iconMode | ios | md | - * | menuType | reveal | overlay | - * | modalEnter | modal-slide-in | modal-md-slide-in | - * | modalLeave | modal-slide-out | modal-md-slide-out | - * | pageTransition | ios-transition | md-transition | - * | pageTransitionDelay | 16 | 120 | - * | tabbarPlacement | bottom | top | - * | tabbarHighlight | | top | - * | tabbarLayout | | | - * | tabSubPages | | true | + * | Config property | Default `ios` Value | Default `md` Value | Default `wp` Value | + * |----------------------------|--------------------------|-----------------------------|-----------------------------| + * | activator | "highlight" | "ripple" | "highlight" | + * | actionSheetEnter | "action-sheet-slide-in" | "action-sheet-md-slide-in" | "action-sheet-wp-slide-in" | + * | actionSheetLeave | "action-sheet-slide-out" | "action-sheet-md-slide-out" | "action-sheet-wp-slide-out" | + * | alertEnter | "alert-pop-in" | "alert-md-pop-in" | "alert-wp-pop-in" | + * | alertLeave | "alert-pop-out" | "alert-md-pop-out" | "alert-wp-pop-out" | + * | backButtonText | "Back" | "" | "" | + * | backButtonIcon | "ios-arrow-back" | "md-arrow-back" | "ios-arrow-back" | + * | iconMode | "ios" | "md" | "ios" | + * | loadingEnter | "loading-pop-in" | "loading-md-pop-in" | "loading-wp-pop-in" | + * | loadingLeave | "loading-pop-out" | "loading-md-pop-out" | "loading-wp-pop-out" | + * | menuType | "reveal" | "overlay" | "overlay" | + * | modalEnter | "modal-slide-in" | "modal-md-slide-in" | "modal-md-slide-in" | + * | modalLeave | "modal-slide-out" | "modal-md-slide-out" | "modal-md-slide-out" | + * | pageTransition | "ios-transition" | "md-transition" | "wp-transition" | + * | pageTransitionDelay | 16 | 96 | 96 | + * | pickerEnter | "picker-slide-in" | "picker-slide-in" | "picker-slide-in" | + * | pickerLeave | "picker-slide-out" | "picker-slide-out" | "picker-slide-out" | + * | pickerRotateFactor | -0.46 | | | + * | spinner | "ios" | "crescent" | "circles" | + * | tabbarHighlight | | true | | + * | tabbarLayout | | | | + * | tabbarPlacement | "bottom" | "top" | "top" | + * | tabSubPages | | true | true | + * | toastEnter | "toast-slide-in" | "toast-md-slide-in" | "toast-wp-slide-in" | + * | toastLeave | "toast-slide-out" | "toast-md-slide-out" | "toast-wp-slide-out" | * **/ export class Config { diff --git a/ionic/config/modes.ts b/ionic/config/modes.ts index 9d6d1dffca2..71fc23ed9e8 100644 --- a/ionic/config/modes.ts +++ b/ionic/config/modes.ts @@ -9,9 +9,6 @@ Config.setModeConfig('ios', { actionSheetEnter: 'action-sheet-slide-in', actionSheetLeave: 'action-sheet-slide-out', - toastEnter: 'toast-slide-in', - toastLeave: 'toast-slide-out', - alertEnter: 'alert-pop-in', alertLeave: 'alert-pop-out', @@ -38,6 +35,9 @@ Config.setModeConfig('ios', { spinner: 'ios', tabbarPlacement: 'bottom', + + toastEnter: 'toast-slide-in', + toastLeave: 'toast-slide-out', }); @@ -48,9 +48,6 @@ Config.setModeConfig('md', { actionSheetEnter: 'action-sheet-md-slide-in', actionSheetLeave: 'action-sheet-md-slide-out', - toastEnter: 'toast-md-slide-in', - toastLeave: 'toast-md-slide-out', - alertEnter: 'alert-md-pop-in', alertLeave: 'alert-md-pop-out', @@ -79,6 +76,9 @@ Config.setModeConfig('md', { tabbarPlacement: 'top', tabSubPages: true, + + toastEnter: 'toast-md-slide-in', + toastLeave: 'toast-md-slide-out', }); @@ -89,9 +89,6 @@ Config.setModeConfig('wp', { actionSheetEnter: 'action-sheet-wp-slide-in', actionSheetLeave: 'action-sheet-wp-slide-out', - toastEnter: 'toast-wp-slide-in', - toastLeave: 'toast-wp-slide-out', - alertEnter: 'alert-wp-pop-in', alertLeave: 'alert-wp-pop-out', @@ -119,4 +116,7 @@ Config.setModeConfig('wp', { tabbarPlacement: 'top', tabSubPages: true, + + toastEnter: 'toast-wp-slide-in', + toastLeave: 'toast-wp-slide-out', });