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(): fix activator typescript errors

Browse Source
This commit is contained in:
Adam Bradley
2016-01-12 11:56:30 -06:00
parent 1bc87fcd71
commit 48757ebbe8
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ionic/components/tap-click/activator.ts
View File

@ -2,24 +2,23 @@ import {raf, rafFrames} from '../../util/dom';
export class Activator { export class Activator {
public activatedClass: any;
public queue: Array<any> = [];
public active: Array<any> = [];
public x: number = 0;
public y: number = 0;
constructor(app, config, zone) { constructor(public app, config, public zone) {
this.app = app;
this.zone = zone;
this.queue = [];
this.active = [];
this.clearStateDefers = 5;
this.clearAttempt = 0;
this.activatedClass = config.get('activatedClass') || 'activated'; this.activatedClass = config.get('activatedClass') || 'activated';
this.x = 0;
this.y = 0;
} }
downAction(ev, activatableEle, pointerX, pointerY, callback) { downAction(ev, activatableEle, pointerX, pointerY) {
// the user just pressed down // the user just pressed down
let self = this; let self = this;
if (self.disableActivated(ev)) return false; if (self.disableActivated(ev)) {
return false;
}
// remember where they pressed // remember where they pressed
self.x = pointerX; self.x = pointerX;
@ -54,7 +53,7 @@ export class Activator {
self.clearState(); self.clearState();
} }
this.zone.runOutsideAngular(() => { this.zone.runOutsideAngular(() => {
rafFrames(self.clearStateDefers, activateUp); rafFrames(CLEAR_STATE_DEFERS, activateUp);
}); });
} }
@ -103,3 +102,5 @@ export class Activator {
} }
} }
const CLEAR_STATE_DEFERS = 5;

8
ionic/components/tap-click/ripple.ts
View File

@ -4,13 +4,12 @@ import {raf, rafFrames} from '../../util/dom';
export class RippleActivator extends Activator { export class RippleActivator extends Activator {
private expands: any = {};
private fades: any = {};
private expandSpeed: number;
constructor(app, config, zone) { constructor(app, config, zone) {
super(app, config, zone); super(app, config, zone);
this.expands = {};
this.fades = {};
this.expandSpeed = null;
} }
downAction(ev, activatableEle, pointerX, pointerY) { downAction(ev, activatableEle, pointerX, pointerY) {
@ -28,6 +27,7 @@ export class RippleActivator extends Activator {
}); });
}); });
} }
return true;
} }
createRipple(activatableEle, pointerX, pointerY, clientRect) { createRipple(activatableEle, pointerX, pointerY, clientRect) {