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

chore(angular): upgrade to angular 2.0.0-beta.1

Browse Source 
Biggest change was that renderer takes  and not just .
This commit is contained in:
Adam Bradley
2016-01-20 11:15:01 -06:00
parent 94ef1f4ce1
commit ee106377fc
21 changed files with 163 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ export class Button {
let element = _elementRef.nativeElement;
if (config.get('hoverCSS') === false) {
_renderer.setElementClass(_elementRef, 'disable-hover', true);
_renderer.setElementClass(_elementRef.nativeElement, 'disable-hover', true);
}
if (element.hasAttribute('ion-item')) {
@ -100,18 +100,21 @@ export class Button {
/**
* @private
*/
addClass(className) {
this._renderer.setElementClass(this._elementRef, className, true);
addClass(className: string) {
this._renderer.setElementClass(this._elementRef.nativeElement, className, true);
}
/**
* @private
*/
setRole(val) {
setRole(val: string) {
this._role = val;
}
_readIcon(element) {
/**
* @private
*/
private _readIcon(element: HTMLElement) {
// figure out if and where the icon lives in the button
let childNodes = element.childNodes;
let childNode;
@ -149,7 +152,10 @@ export class Button {
}
}
_readAttrs(element) {
/**
* @private
*/
private _readAttrs(element: HTMLElement) {
let elementAttrs = element.attributes;
let attrName;
for (let i = 0, l = elementAttrs.length; i < l; i++) {
@ -175,10 +181,13 @@ export class Button {
}
}
_assignCss(assignCssClass) {
/**
* @private
*/
private _assignCss(assignCssClass: boolean) {
let role = this._role;
if (role) {
this._renderer.setElementClass(this._elementRef, role, assignCssClass); // button
this._renderer.setElementClass(this._elementRef.nativeElement, role, assignCssClass); // button
this._setClass(this._style, assignCssClass); // button-clear
this._setClass(this._shape, assignCssClass); // button-round
@ -193,16 +202,19 @@ export class Button {
}
}
_setClass(type, assignCssClass) {
/**
* @private
*/
private _setClass(type: string, assignCssClass: boolean) {
if (type) {
this._renderer.setElementClass(this._elementRef, this._role + '-' + type, assignCssClass);
this._renderer.setElementClass(this._elementRef.nativeElement, this._role + '-' + type, assignCssClass);
}
}
/**
* @private
*/
static setRoles(contentButtonChildren, role) {
static setRoles(contentButtonChildren, role: string) {
let buttons = contentButtonChildren.toArray();
buttons.forEach(button => {
button.setRole(role);