mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
upgrade angular
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import {NgElement, Decorator} from 'angular2/angular2'
|
||||
import {IonicComponent} from 'ionic2/config/component'
|
||||
import {IonicComponent} from 'ionic/config/component'
|
||||
|
||||
@Decorator({
|
||||
selector: 'ion-button, [ion-button],.button',
|
||||
selector: '.button',
|
||||
})
|
||||
export class Button {
|
||||
constructor(
|
||||
@@ -12,6 +12,4 @@ export class Button {
|
||||
this.config = Button.config.invoke(this)
|
||||
}
|
||||
}
|
||||
new IonicComponent(Button, {
|
||||
propClasses: ['primary', 'secondary', 'danger', 'light', 'stable', 'dark', 'block']
|
||||
})
|
||||
new IonicComponent(Button, {})
|
||||
|
||||
@@ -47,14 +47,3 @@
|
||||
<button class="button button-dark hover">hover</button>
|
||||
<button class="button button-dark activated">activated</button>
|
||||
</div>
|
||||
|
||||
<h2>With Properties</h2>
|
||||
|
||||
<div>
|
||||
<button ion-button primary>button.primary</button>
|
||||
<button ion-button secondary>button.secondary</button>
|
||||
<button ion-button stable>button.stable</button>
|
||||
<button ion-button light>button.light</button>
|
||||
<button ion-button dark>button.dark</button>
|
||||
<button ion-button danger>button.danger</button>
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import {bootstrap} from 'angular2/core'
|
||||
import {Component, Template} from 'angular2/angular2'
|
||||
import {Button} from 'ionic2/components/button/button'
|
||||
import {Component, View, bootstrap} from 'angular2/angular2'
|
||||
import {Button} from 'ionic/ionic'
|
||||
|
||||
|
||||
@Component({ selector: '[ion-app]' })
|
||||
@Template({
|
||||
url: 'main.html',
|
||||
@View({
|
||||
templateUrl: 'main.html',
|
||||
directives: [Button]
|
||||
})
|
||||
class IonicApp {}
|
||||
|
||||
Reference in New Issue
Block a user