Skip to content

Commit

Permalink
fix(button) remove outline color class, then add back standard color …
Browse files Browse the repository at this point in the history
…class (#9114)

fixes #9031 fixes #8845
  • Loading branch information
ncapito authored and brandyscarney committed Nov 11, 2016
1 parent 4a74127 commit 898ac3e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/components/button/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class Button extends Ion {
/** @private */
_attr(type: string, attrName: string, attrValue: boolean) {
if (type === '_style') {
this._updateColor(this._color, isTrueProperty(attrValue));
this._updateColor(this._color, false);
}
this._setClass((<any>this)[type], false);
if (isTrueProperty(attrValue)) {
Expand All @@ -241,6 +241,10 @@ export class Button extends Ion {
(<any>this)[type] = (type === '_style' ? 'default' : null);
this._setClass((<any>this)[type], true);
}
if (type === '_style') {
this._updateColor(this._color, true);
}

}

/**
Expand All @@ -251,6 +255,7 @@ export class Button extends Ion {
this._updateColor(this._color, false);
this._updateColor(val, true);
this._color = val;

}

constructor(
Expand Down

0 comments on commit 898ac3e

Please sign in to comment.