javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): remove use of @View

Browse Source
This commit is contained in:
Adam Bradley
2015-10-09 09:15:02 -05:00
parent 9255d473f1
commit 0cac4d9a2e
27 changed files with 134 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ionic/components/scroll/pull-to-refresh.ts
View File

@@ -1,10 +1,10 @@
import {Component, View, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
import {Component, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
import {Content} from '../content/content';
import * as util from 'ionic/util';
import {raf, ready, CSS} from 'ionic/util/dom';
/**
* Allows you to add pull-to-refresh to an Content component.
*
@@ -50,20 +50,18 @@ import {raf, ready, CSS} from 'ionic/util/dom';
'[class.active]': 'isActive',
'[class.refreshing]': 'isRefreshing',
'[class.refreshingTail]': 'isRefreshingTail'
}
})
@View({
template: `<div class="refresher-content" [class.refresher-with-text]="pullingText || refreshingText">
<div class="icon-pulling">
<i class="icon" [ng-class]="pullingIcon"></i>
</div>
<div class="text-pulling" [inner-html]="pullingText" *ng-if="pullingText"></div>
<div class="icon-refreshing">
<!--<ion-spinner ng-if="showSpinner" icon="{{spinner}}"></ion-spinner>-->
<i class="icon" [ng-class]="refreshingIcon"></i>
</div>
<div class="text-refreshing" [inner-html]="refreshingText" *ng-if="refreshingText"></div>
</div>`,
},
template:
'<div class="refresher-content" [class.refresher-with-text]="pullingText || refreshingText">' +
'<div class="icon-pulling">' +
'<i class="icon" [ng-class]="pullingIcon"></i>' +
'</div>' +
'<div class="text-pulling" [inner-html]="pullingText" *ng-if="pullingText"></div>' +
'<div class="icon-refreshing">' +
'<i class="icon" [ng-class]="refreshingIcon"></i>' +
'</div>' +
'<div class="text-refreshing" [inner-html]="refreshingText" *ng-if="refreshingText"></div>' +
'</div>',
directives: [NgIf, NgClass]
})
export class Refresher {

11
ionic/components/scroll/scroll.ts
View File

@@ -1,4 +1,4 @@
import {Component, View, ElementRef, onInit} from 'angular2/angular2';
import {Component, ElementRef, onInit} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicConfig} from '../../config/config';
@@ -21,9 +21,12 @@ import * as util from 'ionic/util';
'[class.scroll-x]': 'scrollX',
'[class.scroll-y]': 'scrollY'
},
})
@View({
template: '<scroll-content><div class="scroll-zoom-wrapper"><ng-content></ng-content></div></scroll-content>'
template:
'<scroll-content>' +
'<div class="scroll-zoom-wrapper">' +
'<ng-content></ng-content>' +
'</div>' +
'</scroll-content>'
})
export class Scroll extends Ion {
/**