From a245bc2a0202fad6d96ab06aff4d5d93f961c8a4 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 3 Jul 2015 14:54:18 -0500 Subject: [PATCH] Back to some semblance of sanity --- config.js | 9 ++++++ .../scroll/test/pull-to-refresh/index.ts | 21 +++++++++++++ .../scroll/test/pull-to-refresh/main.html | 30 +++++++++++++++++++ ionic/components/switch/switch.ts | 12 ++++---- 4 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 ionic/components/scroll/test/pull-to-refresh/index.ts create mode 100644 ionic/components/scroll/test/pull-to-refresh/main.html diff --git a/config.js b/config.js index c039d46cea..614ba69383 100644 --- a/config.js +++ b/config.js @@ -1,5 +1,6 @@ System.config({ "baseURL": "/", + "transpiler": "traceur", "paths": { "*": "*.js", "github:*": "jspm_packages/github/*.js", @@ -7,3 +8,11 @@ System.config({ "ionic/*": "ionic/*" } }); + +System.config({ + "map": { + "traceur": "github:jmcriffey/bower-traceur@0.0.88", + "traceur-runtime": "github:jmcriffey/bower-traceur-runtime@0.0.88" + } +}); + diff --git a/ionic/components/scroll/test/pull-to-refresh/index.ts b/ionic/components/scroll/test/pull-to-refresh/index.ts new file mode 100644 index 0000000000..ce94a63160 --- /dev/null +++ b/ionic/components/scroll/test/pull-to-refresh/index.ts @@ -0,0 +1,21 @@ +import {Component} from 'angular2/angular2'; + +import {IonicView} from 'ionic/ionic'; + + +@Component({ selector: 'ion-app' }) +@IonicView({ + templateUrl: 'main.html' +}) +class MyApp { + constructor() { + console.log('IonicApp Start') + } + doRefresh() { + console.log('DOREFRESH') + } +} + +export function main(ionicBootstrap) { + ionicBootstrap(MyApp); +} diff --git a/ionic/components/scroll/test/pull-to-refresh/main.html b/ionic/components/scroll/test/pull-to-refresh/main.html new file mode 100644 index 0000000000..c1e33a9c36 --- /dev/null +++ b/ionic/components/scroll/test/pull-to-refresh/main.html @@ -0,0 +1,30 @@ + + + Pull To Refresh + + + + + + + + + + + + + + + + diff --git a/ionic/components/switch/switch.ts b/ionic/components/switch/switch.ts index 91318f1b22..1b05e30fa0 100644 --- a/ionic/components/switch/switch.ts +++ b/ionic/components/switch/switch.ts @@ -36,10 +36,10 @@ export class Switch { // TODO: These are temporary until we figure out what to do // with @PropertSetter - let setAriaRole = (v) => this.ele.setAttribute('aria-role', v) - let setAriaChecked = (v) => this.ele.setAttribute('aria-checked', v) - let setAriaInvalid = (v) => this.ele.setAttribute('aria-invalid', v) - let setAriaDisabled = (v) => this.ele.setAttribute('aria-disabled', v) + //let setAriaRole = (v) => { this.ele.setAttribute('aria-role', v) } + //let setAriaChecked = (v) => { this.ele.setAttribute('aria-checked', v) } + //let setAriaInvalid = (v) => { this.ele.setAttribute('aria-invalid', v) } + //let setAriaDisabled = (v) => { this.ele.setAttribute('aria-disabled', v) } //let setChecked = (v) => this.ele.setAttribute('checked', v); @@ -49,7 +49,7 @@ export class Switch { //setAriaRole('checkbox') //setInvalid('false') //setDisabled('false') - this.setCheckedProperty = setAriaChecked + //this.setCheckedProperty = setAriaChecked } /** @@ -63,7 +63,7 @@ export class Switch { set checked(checked) { this._checked = checked - this.setCheckedProperty(checked) + //this.setCheckedProperty(checked) this.controlDirective._control().updateValue(this._checked); }