mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Back to some semblance of sanity
This commit is contained in:
@@ -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"
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
21
ionic/components/scroll/test/pull-to-refresh/index.ts
Normal file
21
ionic/components/scroll/test/pull-to-refresh/index.ts
Normal file
@@ -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);
|
||||
}
|
||||
30
ionic/components/scroll/test/pull-to-refresh/main.html
Normal file
30
ionic/components/scroll/test/pull-to-refresh/main.html
Normal file
@@ -0,0 +1,30 @@
|
||||
<ion-view nav-title="Pull to refresh">
|
||||
<ion-toolbar>
|
||||
<ion-title>Pull To Refresh</ion-title>
|
||||
</ion-toolbar>
|
||||
|
||||
<ion-content>
|
||||
<ion-refresher>
|
||||
</ion-refresher>
|
||||
<f></f>
|
||||
<f></f>
|
||||
<f></f>
|
||||
<f></f>
|
||||
<f></f>
|
||||
<f></f>
|
||||
<f></f>
|
||||
</ion-content>
|
||||
|
||||
</ion-view>
|
||||
<style>
|
||||
f { display: block; height: 400px; width: 100%; background-color: #387ef5; margin-bottom: 15px; }
|
||||
#counter {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
padding: 20px;
|
||||
background-color: rgba(0,0,0,0.4);
|
||||
z-index: 5;
|
||||
}
|
||||
</style>
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user