javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(angular): update to angular 2.0.0-rc.3

Browse Source
This commit is contained in:
Adam Bradley
2016-06-22 14:27:08 -05:00
parent bd82c4d56f
commit e06581d84c
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package.json
View File

@ -13,14 +13,12 @@
"link": "npm install && gulp src && npm link" "link": "npm install && gulp src && npm link"
}, },
"dependencies": { "dependencies": {
"@angular/common": "2.0.0-rc.1", "@angular/common": "2.0.0-rc.3",
"@angular/compiler": "2.0.0-rc.1", "@angular/compiler": "2.0.0-rc.3",
"@angular/core": "2.0.0-rc.1", "@angular/core": "2.0.0-rc.3",
"@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser": "2.0.0-rc.3",
"@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.3",
"@angular/platform-server": "2.0.0-rc.1", "@angular/http": "2.0.0-rc.3",
"@angular/http": "2.0.0-rc.1",
"@angular/router": "2.0.0-rc.1",
"colors": "^1.1.2", "colors": "^1.1.2",
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"inquirer": "0.11.0", "inquirer": "0.11.0",

13
scripts/e2e/e2e.template.html
View File

@ -45,13 +45,12 @@
<script> <script>
System.config({ System.config({
map: { map: {
'@angular/core': '/node_modules/@angular/core/core.umd.js', '@angular/core': '/node_modules/@angular/core/bundles/core.umd.js',
'@angular/compiler': '/node_modules/@angular/compiler/compiler.umd.js', '@angular/compiler': '/node_modules/@angular/compiler/bundles/compiler.umd.js',
'@angular/common': '/node_modules/@angular/common/common.umd.js', '@angular/common': '/node_modules/@angular/common/bundles/common.umd.js',
'@angular/http': '/node_modules/@angular/http/http.umd.js', '@angular/http': '/node_modules/@angular/http/bundles/http.umd.js',
'@angular/platform-browser': '/node_modules/@angular/platform-browser/platform-browser.umd.js', '@angular/platform-browser': '/node_modules/@angular/platform-browser/bundles/platform-browser.umd.js',
'@angular/platform-browser-dynamic': '/node_modules/@angular/platform-browser-dynamic/platform-browser-dynamic.umd.js', '@angular/platform-browser-dynamic': '/node_modules/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'@angular/router': '/node_modules/@angular/router/router.umd.js',
'ionic-angular': '/src' 'ionic-angular': '/src'
}, },
packages: { packages: {

3
scripts/npm/package.json
View File

@ -23,7 +23,6 @@
"@angular/core": "^<%= angularVersion %>", "@angular/core": "^<%= angularVersion %>",
"@angular/platform-browser": "^<%= angularVersion %>", "@angular/platform-browser": "^<%= angularVersion %>",
"@angular/platform-browser-dynamic": "^<%= angularVersion %>", "@angular/platform-browser-dynamic": "^<%= angularVersion %>",
"@angular/http": "^<%= angularVersion %>", "@angular/http": "^<%= angularVersion %>"
"@angular/router": "^<%= angularVersion %>"
} }
} }

4
src/components/alert/alert.ts
View File

@ -320,7 +320,7 @@ export class Alert extends ViewController {
'<div id="{{msgId}}" class="alert-message" [innerHTML]="d.message"></div>' + '<div id="{{msgId}}" class="alert-message" [innerHTML]="d.message"></div>' +
'<div *ngIf="d.inputs.length" [ngSwitch]="inputType">' + '<div *ngIf="d.inputs.length" [ngSwitch]="inputType">' +
'<template ngSwitchWhen="radio">' + '<template ngSwitchCase="radio">' +
'<div class="alert-radio-group" role="radiogroup" [attr.aria-labelledby]="hdrId" [attr.aria-activedescendant]="activeId">' + '<div class="alert-radio-group" role="radiogroup" [attr.aria-labelledby]="hdrId" [attr.aria-activedescendant]="activeId">' +
'<button category="alert-radio-button" *ngFor="let i of d.inputs" (click)="rbClick(i)" [attr.aria-checked]="i.checked" [attr.id]="i.id" class="alert-tappable alert-radio" role="radio">' + '<button category="alert-radio-button" *ngFor="let i of d.inputs" (click)="rbClick(i)" [attr.aria-checked]="i.checked" [attr.id]="i.id" class="alert-tappable alert-radio" role="radio">' +
'<div class="alert-radio-icon"><div class="alert-radio-inner"></div></div>' + '<div class="alert-radio-icon"><div class="alert-radio-inner"></div></div>' +
@ -331,7 +331,7 @@ export class Alert extends ViewController {
'</div>' + '</div>' +
'</template>' + '</template>' +
'<template ngSwitchWhen="checkbox">' + '<template ngSwitchCase="checkbox">' +
'<div class="alert-checkbox-group">' + '<div class="alert-checkbox-group">' +
'<button category="alert-checkbox-button" *ngFor="let i of d.inputs" (click)="cbClick(i)" [attr.aria-checked]="i.checked" class="alert-tappable alert-checkbox" role="checkbox">' + '<button category="alert-checkbox-button" *ngFor="let i of d.inputs" (click)="cbClick(i)" [attr.aria-checked]="i.checked" class="alert-tappable alert-checkbox" role="checkbox">' +
'<div class="alert-checkbox-icon"><div class="alert-checkbox-inner"></div></div>' + '<div class="alert-checkbox-icon"><div class="alert-checkbox-inner"></div></div>' +