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(angular): update to angular 2.0.0-rc.1

Browse Source
This commit is contained in:
Adam Bradley
2016-05-16 14:55:08 -05:00
parent ba2826068f 158f7175d9
commit ea21c6ca3c
137 changed files with 342 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ionic/components/picker/picker.ts
View File

@@ -1,4 +1,4 @@
import {Component, ElementRef, Input, Output, EventEmitter, ViewChildren, QueryList, ViewChild, Renderer, HostListener, ViewEncapsulation} from 'angular2/core';
import {Component, ElementRef, Input, Output, EventEmitter, ViewChildren, QueryList, ViewChild, Renderer, HostListener, ViewEncapsulation} from '@angular/core';
import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
@@ -88,7 +88,7 @@ export class Picker extends ViewController {
template:
'<div *ngIf="col.prefix" class="picker-prefix" [style.width]="col.prefixWidth">{{col.prefix}}</div>' +
'<div class="picker-opts" #colEle [style.width]="col.optionsWidth">' +
'<button *ngFor="#o of col.options; #i=index" [style.transform]="o._trans" [style.transitionDuration]="o._dur" [class.picker-opt-selected]="col.selectedIndex === i" [class.picker-opt-disabled]="o.disabled" (click)="optClick($event, i)" type="button" category="picker-opt">' +
'<button *ngFor="let o of col.options; let i=index;" (click)="optClick($event, i)" type="button" category="picker-opt">' +
'{{o.text}}' +
'</button>' +
'</div>' +
@@ -342,7 +342,10 @@ class PickerColumnCmp {
this.col.selectedIndex = Math.max(Math.abs(Math.round(y / this.optHeight)), 0);
let colElements = this.colEle.nativeElement.querySelectorAll('.picker-opt');
for (var i = 0; i < this.col.options.length; i++) {
var ele: HTMLElement = colElements[i];
var opt = <any>this.col.options[i];
var optTop = (i * this.optHeight);
var optOffset = (optTop + y);
@@ -364,8 +367,11 @@ class PickerColumnCmp {
translateY = optOffset;
}
opt._trans = `rotateX(${rotateX}deg) translate3d(${translateX}px,${translateY}px,${translateZ}px)`;
opt._dur = (duration > 0 ? duration + 'ms' : '');
// TODO: setting by [style.transform]="o.transform" within the template is currently broke
ele.style[CSS.transform] = `rotateX(${rotateX}deg) translate3d(${translateX}px,${translateY}px,${translateZ}px)`;
ele.style[CSS.transitionDuration] = (duration > 0 ? duration + 'ms' : '');
ele.classList[this.col.selectedIndex===i ? 'add' : 'remove']('picker-opt-selected');
ele.classList[opt.disabled ? 'add' : 'remove']('picker-opt-disabled');
}
if (saveY) {
@@ -436,7 +442,7 @@ class PickerColumnCmp {
'<div (click)="bdClick()" tappable disable-activated class="backdrop" role="presentation"></div>' +
'<div class="picker-wrapper">' +
'<div class="picker-toolbar">' +
'<div *ngFor="#b of d.buttons" class="picker-toolbar-button" [ngClass]="b.cssRole">' +
'<div *ngFor="let b of d.buttons" class="picker-toolbar-button" [ngClass]="b.cssRole">' +
'<button (click)="btnClick(b)" [ngClass]="b.cssClass" class="picker-button" clear>' +
'{{b.text}}' +
'</button>' +
@@ -444,7 +450,7 @@ class PickerColumnCmp {
'</div>' +
'<div class="picker-columns">' +
'<div class="picker-above-highlight"></div>' +
'<div *ngFor="#c of d.columns" [col]="c" class="picker-col" (change)="_colChange($event)"></div>' +
'<div *ngFor="let c of d.columns" [col]="c" class="picker-col"> (change)="_colChange($event)"</div>' +
'<div class="picker-below-highlight"></div>' +
'</div>' +
'</div>',

2
ionic/components/picker/test/basic/index.ts
View File

@@ -1,4 +1,4 @@
import {ViewEncapsulation} from 'angular2/core';
import {ViewEncapsulation} from '@angular/core';
import {App, Page, Picker, NavController} from '../../../../../ionic';