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

test(button): update karma and e2e tests for the new color input

Browse Source
This commit is contained in:
Brandy Carney
2016-08-23 18:34:55 -04:00
parent 55a0257dbc
commit 8c1662d5e9
3 changed files with 120 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/components/button/button.ts
View File

@ -96,15 +96,32 @@ import { isTrueProperty } from '../../util/util';
encapsulation: ViewEncapsulation.None,
})
export class Button {
private _role: string = 'button'; // bar-button
private _mt: boolean = false; // menutoggle
private _size: string = null; // large/small/default
private _style: string = 'default'; // outline/clear/solid
private _shape: string = null; // round/fab
private _display: string = null; // block/full
private _color: string = null; // primary/secondary
private _disabled: boolean = false; // disabled
private _init: boolean;
/** @internal */
_role: string = 'button'; // bar-button
/** @internal */
_mt: boolean = false; // menutoggle
/** @internal */
_size: string = null; // large/small/default
/** @internal */
_style: string = 'default'; // outline/clear/solid
/** @internal */
_shape: string = null; // round/fab
/** @internal */
_display: string = null; // block/full
/** @internal */
_color: string = null; // primary/secondary
/** @internal */
_disabled: boolean = false; // disabled
/** @internal */
_init: boolean;
/**
* @input {string} Large button.
@ -189,15 +206,16 @@ export class Button {
_attr(type: string, attrName: string, attrValue: boolean) {
if (type === '_style') {
this._setColor(this._color, isTrueProperty(attrValue));
}
this._setClass(this[type], false);
}
this._setClass((<any>this)[type], false);
if (isTrueProperty(attrValue)) {
this[type] = attrName;
(<any>this)[type] = attrName;
this._setClass(attrName, true);
} else {
// Special handling for '_style' which defaults to 'default'.
this[type] = (type === '_style' ? 'default' : null);
this._setClass(this[type], true);
(<any>this)[type] = (type === '_style' ? 'default' : null);
this._setClass((<any>this)[type], true);
}
}
@ -271,12 +289,12 @@ export class Button {
}
/**
* @private
* @internal
*/
private _assignCss(assignCssClass: boolean) {
_assignCss(assignCssClass: boolean) {
let role = this._role;
if (role) {
this._renderer.setElementClass(this._elementRef.nativeElement, role, assignCssClass); // button
this._renderer.setElementClass(this._elementRef.nativeElement, role, assignCssClass); // button
this._setClass('menutoggle', this._mt); // menutoggle
@ -287,7 +305,7 @@ export class Button {
this._setColor(this._color, assignCssClass); // button-secondary, bar-button-secondary
}
}
/**
* @internal
*/
@ -316,5 +334,5 @@ export class Button {
this._renderer.setElementClass(this._elementRef.nativeElement, `${className}-${color}`, isAdd);
}
}
}
}
}