Skip to content

Commit 5e23ea5

Browse files
IonitronIonitron
committed
Automated build of ionic v2.0.0-beta.6 ionic-team/ionic-framework@81cb0ff 
1 parent 2557b61 commit 5e23ea5

File tree

39 files changed

+1266
-1220
lines changed

39 files changed

+1266
-1220
lines changed

‎docs/v2/api/config/Config/index.md

Lines changed: 79 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -92,166 +92,138 @@ Simply add <code>?ionic&lt;PROPERTYNAME&gt;=&lt;value&gt;</code> to the url.</p>
9292
// from any page in your app:
9393
config.get(&#39;favoriteColor&#39;); // &#39;green&#39;
9494
</code></pre>
95-
<p>A config value can come from anywhere and be anything, but there are a default set of values.</p>
95+
<p>A config value can come from anywhere and be anything, but there are default
96+
values for each mode. The <a href="../../../theming/platform-specific-styles/">theming</a>
97+
documentation has a chart of the default mode configuration. The following
98+
chart displays each property with a description of what it controls.</p>
9699
<table>
97100
<thead>
98101
<tr>
99-
<th>Config property</th>
100-
<th>Default <code>ios</code> Value</th>
101-
<th>Default <code>md</code> Value</th>
102-
<th>Default <code>wp</code> Value</th>
102+
<th>Config Property</th>
103+
<th>Type</th>
104+
<th>Details</th>
103105
</tr>
104106
</thead>
105107
<tbody>
106108
<tr>
107-
<td>activator</td>
108-
<td>&quot;highlight&quot;</td>
109-
<td>&quot;ripple&quot;</td>
110-
<td>&quot;highlight&quot;</td>
109+
<td><code>activator</code></td>
110+
<td><code>string</code></td>
111+
<td>Used for buttons, changes the effect of pressing on a button. Available options: <code>&quot;ripple&quot;</code>, <code>&quot;highlight&quot;</code>.</td>
111112
</tr>
112113
<tr>
113-
<td>actionSheetEnter</td>
114-
<td>&quot;action-sheet-slide-in&quot;</td>
115-
<td>&quot;action-sheet-md-slide-in&quot;</td>
116-
<td>&quot;action-sheet-wp-slide-in&quot;</td>
114+
<td><code>actionSheetEnter</code></td>
115+
<td><code>string</code></td>
116+
<td>The name of the transition to use while an action sheet is presented.</td>
117117
</tr>
118118
<tr>
119-
<td>actionSheetLeave</td>
120-
<td>&quot;action-sheet-slide-out&quot;</td>
121-
<td>&quot;action-sheet-md-slide-out&quot;</td>
122-
<td>&quot;action-sheet-wp-slide-out&quot;</td>
119+
<td><code>actionSheetLeave</code></td>
120+
<td><code>string</code></td>
121+
<td>The name of the transition to use while an action sheet is dismissed.</td>
123122
</tr>
124123
<tr>
125-
<td>alertEnter</td>
126-
<td>&quot;alert-pop-in&quot;</td>
127-
<td>&quot;alert-md-pop-in&quot;</td>
128-
<td>&quot;alert-wp-pop-in&quot;</td>
124+
<td><code>alertEnter</code></td>
125+
<td><code>string</code></td>
126+
<td>The name of the transition to use while an alert is presented.</td>
129127
</tr>
130128
<tr>
131-
<td>alertLeave</td>
132-
<td>&quot;alert-pop-out&quot;</td>
133-
<td>&quot;alert-md-pop-out&quot;</td>
134-
<td>&quot;alert-wp-pop-out&quot;</td>
129+
<td><code>alertLeave</code></td>
130+
<td><code>string</code></td>
131+
<td>The name of the transition to use while an alert is dismissed.</td>
135132
</tr>
136133
<tr>
137-
<td>backButtonText</td>
138-
<td>&quot;Back&quot;</td>
139-
<td>&quot;&quot;</td>
140-
<td>&quot;&quot;</td>
134+
<td><code>backButtonText</code></td>
135+
<td><code>string</code></td>
136+
<td>The text to display by the back button icon in the navbar.</td>
141137
</tr>
142138
<tr>
143-
<td>backButtonIcon</td>
144-
<td>&quot;ios-arrow-back&quot;</td>
145-
<td>&quot;md-arrow-back&quot;</td>
146-
<td>&quot;ios-arrow-back&quot;</td>
139+
<td><code>backButtonIcon</code></td>
140+
<td><code>string</code></td>
141+
<td>The icon to use as the back button icon.</td>
147142
</tr>
148143
<tr>
149-
<td>iconMode</td>
150-
<td>&quot;ios&quot;</td>
151-
<td>&quot;md&quot;</td>
152-
<td>&quot;ios&quot;</td>
144+
<td><code>iconMode</code></td>
145+
<td><code>string</code></td>
146+
<td>The mode to use for all icons throughout the application. Available options: <code>&quot;ios&quot;</code>, <code>&quot;md&quot;</code></td>
153147
</tr>
154148
<tr>
155-
<td>loadingEnter</td>
156-
<td>&quot;loading-pop-in&quot;</td>
157-
<td>&quot;loading-md-pop-in&quot;</td>
158-
<td>&quot;loading-wp-pop-in&quot;</td>
149+
<td><code>loadingEnter</code></td>
150+
<td><code>string</code></td>
151+
<td>The name of the transition to use while a loading indicator is presented.</td>
159152
</tr>
160153
<tr>
161-
<td>loadingLeave</td>
162-
<td>&quot;loading-pop-out&quot;</td>
163-
<td>&quot;loading-md-pop-out&quot;</td>
164-
<td>&quot;loading-wp-pop-out&quot;</td>
154+
<td><code>loadingLeave</code></td>
155+
<td><code>string</code></td>
156+
<td>The name of the transition to use while a loading indicator is dismissed.</td>
165157
</tr>
166158
<tr>
167-
<td>menuType</td>
168-
<td>&quot;reveal&quot;</td>
169-
<td>&quot;overlay&quot;</td>
170-
<td>&quot;overlay&quot;</td>
159+
<td><code>menuType</code></td>
160+
<td><code>string</code></td>
161+
<td>Type of menu to display. Available options: <code>&quot;overlay&quot;</code>, <code>&quot;reveal&quot;</code>, <code>&quot;push&quot;</code>.</td>
171162
</tr>
172163
<tr>
173-
<td>modalEnter</td>
174-
<td>&quot;modal-slide-in&quot;</td>
175-
<td>&quot;modal-md-slide-in&quot;</td>
176-
<td>&quot;modal-md-slide-in&quot;</td>
164+
<td><code>modalEnter</code></td>
165+
<td><code>string</code></td>
166+
<td>The name of the transition to use while a modal is presented.</td>
177167
</tr>
178168
<tr>
179-
<td>modalLeave</td>
180-
<td>&quot;modal-slide-out&quot;</td>
181-
<td>&quot;modal-md-slide-out&quot;</td>
182-
<td>&quot;modal-md-slide-out&quot;</td>
169+
<td><code>modalLeave</code></td>
170+
<td><code>string</code></td>
171+
<td>The name of the transition to use while a modal is dismiss.</td>
183172
</tr>
184173
<tr>
185-
<td>pageTransition</td>
186-
<td>&quot;ios-transition&quot;</td>
187-
<td>&quot;md-transition&quot;</td>
188-
<td>&quot;wp-transition&quot;</td>
174+
<td><code>pageTransition</code></td>
175+
<td><code>string</code></td>
176+
<td>The name of the transition to use while changing pages.</td>
189177
</tr>
190178
<tr>
191-
<td>pageTransitionDelay</td>
192-
<td>16</td>
193-
<td>96</td>
194-
<td>96</td>
179+
<td><code>pageTransitionDelay</code></td>
180+
<td><code>number</code></td>
181+
<td>The delay in milliseconds before the transition starts while changing pages.</td>
195182
</tr>
196183
<tr>
197-
<td>pickerEnter</td>
198-
<td>&quot;picker-slide-in&quot;</td>
199-
<td>&quot;picker-slide-in&quot;</td>
200-
<td>&quot;picker-slide-in&quot;</td>
184+
<td><code>pickerEnter</code></td>
185+
<td><code>string</code></td>
186+
<td>The name of the transition to use while a picker is presented.</td>
201187
</tr>
202188
<tr>
203-
<td>pickerLeave</td>
204-
<td>&quot;picker-slide-out&quot;</td>
205-
<td>&quot;picker-slide-out&quot;</td>
206-
<td>&quot;picker-slide-out&quot;</td>
189+
<td><code>pickerLeave</code></td>
190+
<td><code>string</code></td>
191+
<td>The name of the transition to use while a picker is dismissed.</td>
207192
</tr>
208193
<tr>
209-
<td>pickerRotateFactor</td>
210-
<td>-0.46</td>
211-
<td></td>
212-
<td></td>
194+
<td><code>spinner</code></td>
195+
<td><code>string</code></td>
196+
<td>The default spinner to use when a name is not defined.</td>
213197
</tr>
214198
<tr>
215-
<td>spinner</td>
216-
<td>&quot;ios&quot;</td>
217-
<td>&quot;crescent&quot;</td>
218-
<td>&quot;circles&quot;</td>
199+
<td><code>tabbarHighlight</code></td>
200+
<td><code>boolean</code></td>
201+
<td>Whether to show a highlight line under the tab when it is selected.</td>
219202
</tr>
220203
<tr>
221-
<td>tabbarHighlight</td>
222-
<td></td>
223-
<td>true</td>
224-
<td></td>
204+
<td><code>tabbarLayout</code></td>
205+
<td><code>string</code></td>
206+
<td>The layout to use for all tabs. Available options: <code>&quot;icon-top&quot;</code>, <code>&quot;icon-left&quot;</code>, <code>&quot;icon-right&quot;</code>, <code>&quot;icon-bottom&quot;</code>, <code>&quot;icon-hide&quot;</code>, <code>&quot;title-hide&quot;</code>.</td>
225207
</tr>
226208
<tr>
227-
<td>tabbarLayout</td>
228-
<td></td>
229-
<td></td>
230-
<td></td>
209+
<td><code>tabbarPlacement</code></td>
210+
<td><code>string</code></td>
211+
<td>The position of the tabs. Available options: <code>&quot;top&quot;</code>, <code>&quot;bottom&quot;</code></td>
231212
</tr>
232213
<tr>
233-
<td>tabbarPlacement</td>
234-
<td>&quot;bottom&quot;</td>
235-
<td>&quot;top&quot;</td>
236-
<td>&quot;top&quot;</td>
214+
<td><code>tabSubPages</code></td>
215+
<td><code>boolean</code></td>
216+
<td>Whether to hide the tabs on child pages or not. If <code>true</code> it will not show the tabs on child pages.</td>
237217
</tr>
238218
<tr>
239-
<td>tabSubPages</td>
240-
<td></td>
241-
<td>true</td>
242-
<td>true</td>
219+
<td><code>toastEnter</code></td>
220+
<td><code>string</code></td>
221+
<td>The name of the transition to use while a toast is presented.</td>
243222
</tr>
244223
<tr>
245-
<td>toastEnter</td>
246-
<td>&quot;toast-slide-in&quot;</td>
247-
<td>&quot;toast-md-slide-in&quot;</td>
248-
<td>&quot;toast-wp-slide-in&quot;</td>
249-
</tr>
250-
<tr>
251-
<td>toastLeave</td>
252-
<td>&quot;toast-slide-out&quot;</td>
253-
<td>&quot;toast-md-slide-out&quot;</td>
254-
<td>&quot;toast-wp-slide-out&quot;</td>
224+
<td><code>toastLeave</code></td>
225+
<td><code>string</code></td>
226+
<td>The name of the transition to use while a toast is dismissed.</td>
255227
</tr>
256228
</tbody>
257229
</table>

‎docs/v2/demos/action-sheet/bundle.js

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21137,36 +21137,38 @@
2113721137
* ```
2113821138
*
2113921139
*
21140-
* A config value can come from anywhere and be anything, but there are a default set of values.
21141-
*
21142-
*
21143-
* | Config property | Default `ios` Value | Default `md` Value | Default `wp` Value |
21144-
* |----------------------------|--------------------------|-----------------------------|-----------------------------|
21145-
* | activator | "highlight" | "ripple" | "highlight" |
21146-
* | actionSheetEnter | "action-sheet-slide-in" | "action-sheet-md-slide-in" | "action-sheet-wp-slide-in" |
21147-
* | actionSheetLeave | "action-sheet-slide-out" | "action-sheet-md-slide-out" | "action-sheet-wp-slide-out" |
21148-
* | alertEnter | "alert-pop-in" | "alert-md-pop-in" | "alert-wp-pop-in" |
21149-
* | alertLeave | "alert-pop-out" | "alert-md-pop-out" | "alert-wp-pop-out" |
21150-
* | backButtonText | "Back" | "" | "" |
21151-
* | backButtonIcon | "ios-arrow-back" | "md-arrow-back" | "ios-arrow-back" |
21152-
* | iconMode | "ios" | "md" | "ios" |
21153-
* | loadingEnter | "loading-pop-in" | "loading-md-pop-in" | "loading-wp-pop-in" |
21154-
* | loadingLeave | "loading-pop-out" | "loading-md-pop-out" | "loading-wp-pop-out" |
21155-
* | menuType | "reveal" | "overlay" | "overlay" |
21156-
* | modalEnter | "modal-slide-in" | "modal-md-slide-in" | "modal-md-slide-in" |
21157-
* | modalLeave | "modal-slide-out" | "modal-md-slide-out" | "modal-md-slide-out" |
21158-
* | pageTransition | "ios-transition" | "md-transition" | "wp-transition" |
21159-
* | pageTransitionDelay | 16 | 96 | 96 |
21160-
* | pickerEnter | "picker-slide-in" | "picker-slide-in" | "picker-slide-in" |
21161-
* | pickerLeave | "picker-slide-out" | "picker-slide-out" | "picker-slide-out" |
21162-
* | pickerRotateFactor | -0.46 | | |
21163-
* | spinner | "ios" | "crescent" | "circles" |
21164-
* | tabbarHighlight | | true | |
21165-
* | tabbarLayout | | | |
21166-
* | tabbarPlacement | "bottom" | "top" | "top" |
21167-
* | tabSubPages | | true | true |
21168-
* | toastEnter | "toast-slide-in" | "toast-md-slide-in" | "toast-wp-slide-in" |
21169-
* | toastLeave | "toast-slide-out" | "toast-md-slide-out" | "toast-wp-slide-out" |
21140+
* A config value can come from anywhere and be anything, but there are default
21141+
* values for each mode. The [theming](../../../theming/platform-specific-styles/)
21142+
* documentation has a chart of the default mode configuration. The following
21143+
* chart displays each property with a description of what it controls.
21144+
*
21145+
*
21146+
* | Config Property | Type | Details |
21147+
* |--------------------------|---------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|
21148+
* | `activator` | `string` | Used for buttons, changes the effect of pressing on a button. Available options: `"ripple"`, `"highlight"`. |
21149+
* | `actionSheetEnter` | `string` | The name of the transition to use while an action sheet is presented. |
21150+
* | `actionSheetLeave` | `string` | The name of the transition to use while an action sheet is dismissed. |
21151+
* | `alertEnter` | `string` | The name of the transition to use while an alert is presented. |
21152+
* | `alertLeave` | `string` | The name of the transition to use while an alert is dismissed. |
21153+
* | `backButtonText` | `string` | The text to display by the back button icon in the navbar. |
21154+
* | `backButtonIcon` | `string` | The icon to use as the back button icon. |
21155+
* | `iconMode` | `string` | The mode to use for all icons throughout the application. Available options: `"ios"`, `"md"` |
21156+
* | `loadingEnter` | `string` | The name of the transition to use while a loading indicator is presented. |
21157+
* | `loadingLeave` | `string` | The name of the transition to use while a loading indicator is dismissed. |
21158+
* | `menuType` | `string` | Type of menu to display. Available options: `"overlay"`, `"reveal"`, `"push"`. |
21159+
* | `modalEnter` | `string` | The name of the transition to use while a modal is presented. |
21160+
* | `modalLeave` | `string` | The name of the transition to use while a modal is dismiss. |
21161+
* | `pageTransition` | `string` | The name of the transition to use while changing pages. |
21162+
* | `pageTransitionDelay` | `number` | The delay in milliseconds before the transition starts while changing pages. |
21163+
* | `pickerEnter` | `string` | The name of the transition to use while a picker is presented. |
21164+
* | `pickerLeave` | `string` | The name of the transition to use while a picker is dismissed. |
21165+
* | `spinner` | `string` | The default spinner to use when a name is not defined. |
21166+
* | `tabbarHighlight` | `boolean` | Whether to show a highlight line under the tab when it is selected. |
21167+
* | `tabbarLayout` | `string` | The layout to use for all tabs. Available options: `"icon-top"`, `"icon-left"`, `"icon-right"`, `"icon-bottom"`, `"icon-hide"`, `"title-hide"`. |
21168+
* | `tabbarPlacement` | `string` | The position of the tabs. Available options: `"top"`, `"bottom"` |
21169+
* | `tabSubPages` | `boolean` | Whether to hide the tabs on child pages or not. If `true` it will not show the tabs on child pages. |
21170+
* | `toastEnter` | `string` | The name of the transition to use while a toast is presented. |
21171+
* | `toastLeave` | `string` | The name of the transition to use while a toast is dismissed. |
2117021172
*
2117121173
**/
2117221174
var Config = (function () {

0 commit comments

Comments
 (0)