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

refactor(animations): inline css animations

Browse Source
This commit is contained in:
Adam Bradley
2016-02-09 16:22:40 -06:00
parent de76cefcf3
commit da18868636
94 changed files with 1071 additions and 6905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ionic/components/button/button.ts
View File

@@ -30,7 +30,11 @@ import {Toolbar} from '../toolbar/toolbar';
*/
@Component({
selector: 'button:not([ion-item]),[button]',
template: '<span class="button-inner"><ng-content></ng-content></span>'
template:
'<span class="button-inner">' +
'<ng-content></ng-content>' +
'</span>' +
'<ion-button-effect></ion-button-effect>'
})
export class Button {
private _role: string = 'button'; // bar-button/item-button
@@ -125,7 +129,7 @@ export class Button {
private _readIcon(element: HTMLElement) {
// figure out if and where the icon lives in the button
let childNodes = element.childNodes;
if (childNodes.length == 1) {
if (childNodes.length > 0) {
childNodes = childNodes[0].childNodes;
}
let childNode;
@@ -158,6 +162,7 @@ export class Button {
} else if (nodes[0] === TEXT && nodes[1] === ICON) {
this._icon = 'icon-right';
}
} else if (nodes.length === 1 && nodes[0] === ICON) {
this._icon = 'icon-only';
}