javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(actionSheet): remove MD icon defaults

Browse Source
This commit is contained in:
Adam Bradley
2016-01-04 12:46:57 -06:00
parent ed84af7aeb
commit 3315303b3e
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/action-sheet/action-sheet.ts
View File

@@ -197,16 +197,10 @@ class ActionSheetCmp {
}
if (button.style === 'cancel') {
if (!button.icon) {
button.icon = this._config.get('actionSheetCancelIcon');
}
this.d.cancelButton = button;
} else {
if (button.style === 'destructive') {
if (!button.icon) {
button.icon = this._config.get('actionSheetDestructiveIcon');
}
button.cssClass = (button.cssClass + ' ' || '') + 'action-sheet-destructive';
}
buttons.push(button);

4
ionic/components/text-input/test/input-focus/main.html
View File

@@ -116,11 +116,11 @@
Radios
</ion-list-header>
<ion-radio>
<ion-radio value="1">
Radio 1
</ion-radio>
<ion-radio>
<ion-radio value="2">
Radio 2
</ion-radio>

6
ionic/config/config.ts
View File

@@ -78,8 +78,8 @@ import {isObject, isDefined, isFunction, isArray, extend} from '../util/util';
* | activator | highlight | ripple |
* | actionSheetEnter | action-sheet-slide-in | action-sheet-md-slide-in |
* | actionSheetLeave | action-sheet-slide-out | action-sheet-md-slide-out |
* | actionSheetCancelIcon | | ion-md-close |
* | actionSheetDestructiveIcon | | ion-md-trash |
* | 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 |
@@ -88,8 +88,6 @@ import {isObject, isDefined, isFunction, isArray, extend} from '../util/util';
* | modalLeave | modal-slide-out | modal-md-slide-out |
* | pageTransition | ios-transition | md-transition |
* | pageTransitionDelay | 16 | 120 |
* | popupEnter | popup-pop-in | popup-md-pop-in |
* | popupLeave | popup-pop-out | popup-md-pop-out |
* | tabbarPlacement | bottom | top |
* | tabbarHighlight | | top |
* | tabSubPage | | true |

4
ionic/config/modes.ts
View File

@@ -8,8 +8,6 @@ Config.setModeConfig('ios', {
actionSheetEnter: 'action-sheet-slide-in',
actionSheetLeave: 'action-sheet-slide-out',
actionSheetCancelIcon: '',
actionSheetDestructiveIcon: '',
alertEnter: 'alert-pop-in',
alertLeave: 'alert-pop-out',
@@ -37,8 +35,6 @@ Config.setModeConfig('md', {
actionSheetEnter: 'action-sheet-md-slide-in',
actionSheetLeave: 'action-sheet-md-slide-out',
actionSheetCancelIcon: 'ion-md-close',
actionSheetDestructiveIcon: 'ion-md-trash',
alertEnter: 'alert-md-pop-in',
alertLeave: 'alert-md-pop-out',