Skip to content

Commit

Permalink
docs(config): update config with windows mode
Browse files Browse the repository at this point in the history
rearrange mode config so it is in alphabetical order

references ionic-team/ionic-site#585
  • Loading branch information
brandyscarney committed Apr 28, 2016
1 parent e905bd7 commit 49e1b20
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 28 deletions.
46 changes: 27 additions & 19 deletions ionic/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
18 changes: 9 additions & 9 deletions ionic/config/modes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand All @@ -38,6 +35,9 @@ Config.setModeConfig('ios', {
spinner: 'ios',

tabbarPlacement: 'bottom',

toastEnter: 'toast-slide-in',
toastLeave: 'toast-slide-out',
});


Expand All @@ -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',

Expand Down Expand Up @@ -79,6 +76,9 @@ Config.setModeConfig('md', {
tabbarPlacement: 'top',

tabSubPages: true,

toastEnter: 'toast-md-slide-in',
toastLeave: 'toast-md-slide-out',
});


Expand All @@ -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',

Expand Down Expand Up @@ -119,4 +116,7 @@ Config.setModeConfig('wp', {
tabbarPlacement: 'top',

tabSubPages: true,

toastEnter: 'toast-wp-slide-in',
toastLeave: 'toast-wp-slide-out',
});

0 comments on commit 49e1b20

Please sign in to comment.