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

Merge branch 'master' into alpha38

Browse Source 
Conflicts:
	ionic/components/nav/view-controller.ts
	ionic/components/tabs/tab.ts
This commit is contained in:
Adam Bradley
2015-10-05 11:47:45 -05:00
parent 6955a8cdba 649e76167f
commit b7d1d2debf
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import {Directive, ElementRef} from 'angular2/angular2';
import {Directive, ElementRef, Renderer} from 'angular2/angular2';
import {IonicConfig} from '../../config/config';
@@ -13,7 +13,8 @@ export class Button {
constructor(
config: IonicConfig,
elementRef: ElementRef
elementRef: ElementRef,
renderer: Renderer
) {
let element = elementRef.nativeElement;
@@ -21,6 +22,12 @@ export class Button {
element.classList.add('disable-hover');
}
// TODO this isn't working in the popup
if (element.hasAttribute('type')) {
let type = element.getAttribute("type");
renderer.setElementAttribute(elementRef, type, "");
}
if (element.hasAttribute('ion-item')) {
// no need to put on these icon classes for an ion-item
return;