javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(overlays): check if button cssClass exists before splitting

Browse Source
This commit is contained in:
Brandy Carney
2017-11-30 17:25:50 -05:00
parent dfaa2eda1e
commit f3e7021ba1
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/src/components/action-sheet/action-sheet.tsx
View File

@ -146,11 +146,14 @@ export class ActionSheet {
} }
buttonClass(button: ActionSheetButton): CssClassMap { buttonClass(button: ActionSheetButton): CssClassMap {
let customClass = button.cssClass.split(' ').filter(b => b.trim() !== '').join(' ');
let buttonClass: string[] = !button.role let buttonClass: string[] = !button.role
? ['action-sheet-button', customClass] ? ['action-sheet-button']
: [`action-sheet-button`, `action-sheet-${button.role}`, customClass]; : [`action-sheet-button`, `action-sheet-${button.role}`];
if (button.cssClass) {
let customClass = button.cssClass.split(' ').filter(b => b.trim() !== '').join(' ');
buttonClass.push(customClass);
}
return buttonClass.reduce((prevValue: any, cssClass: any) => { return buttonClass.reduce((prevValue: any, cssClass: any) => {
prevValue[cssClass] = true; prevValue[cssClass] = true;

2
packages/core/src/components/action-sheet/test/basic/index.html
View File

@ -301,7 +301,7 @@
{ {
text: 'Test', text: 'Test',
role: 'test', role: 'test',
cssClass: 'my-cancel-button, my-custom-button customClass', cssClass: 'my-cancel-button my-custom-button customClass',
handler: () => { handler: () => {
console.log('Cancel clicked'); console.log('Cancel clicked');
} }

10
packages/core/src/components/alert/alert.tsx
View File

@ -241,10 +241,12 @@ export class Alert {
} }
buttonClass(button: AlertButton): CssClassMap { buttonClass(button: AlertButton): CssClassMap {
let customClass = button.cssClass.split(' ').filter(b => b.trim() !== '').join(' '); let buttonClass: string[] = ['alert-button'];
let buttonClass: string[] = !button.cssClass
? ['alert-button', customClass] if (button.cssClass) {
: [`alert-button`, `${button.cssClass}`, customClass]; let customClass = button.cssClass.split(' ').filter(b => b.trim() !== '').join(' ');
buttonClass.push(customClass);
}
return buttonClass.reduce((prevValue: any, cssClass: any) => { return buttonClass.reduce((prevValue: any, cssClass: any) => {
prevValue[cssClass] = true; prevValue[cssClass] = true;