Skip to content
This repository has been archived by the owner on Aug 15, 2023. It is now read-only.

Commit

Permalink
chore(ionic): update to latest nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
brandyscarney committed Jan 11, 2017
1 parent 420663a commit 50ae32c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
6 changes: 4 additions & 2 deletions package.json
Expand Up @@ -4,6 +4,8 @@
"homepage": "http://ionicframework.com/",
"private": true,
"scripts": {
"build": "ionic-app-scripts build",
"clean": "ionic-app-scripts clean",
"ionic:build": "ionic-app-scripts build",
"ionic:serve": "ionic-app-scripts serve"
},
Expand All @@ -21,14 +23,14 @@
"@angular/platform-browser-dynamic": "2.2.1",
"@angular/platform-server": "2.2.1",
"@ionic/storage": "1.1.6",
"ionic-angular": "2.0.0-rc.4",
"ionic-angular": "2.0.0-rc.4-201701101706",
"ionic-native": "2.2.11",
"ionicons": "3.0.0",
"rxjs": "5.0.0-beta.12",
"zone.js": "0.6.26"
},
"devDependencies": {
"@ionic/app-scripts": "0.0.47",
"@ionic/app-scripts": "1.0.0",
"typescript": "2.0.9"
},
"cordovaPlugins": [
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.component.ts
@@ -1,5 +1,5 @@
import { Component, NgZone, ViewChild } from '@angular/core';
import { Config, Menu, NavController, Platform, QueryParams } from 'ionic-angular';
import { Config, Menu, NavController, Platform } from 'ionic-angular';

import * as helpers from '../directives/helpers';
import { PageOne, PageTwo, PageThree } from '../pages/menus/basic/pages';
Expand All @@ -24,7 +24,7 @@ export class MyApp {
{ title: 'Events', component: PageThree }
];

constructor(public platform: Platform, public config: Config, public zone: NgZone, public queryParams: QueryParams) {
constructor(public platform: Platform, public config: Config, public zone: NgZone) {
this.rootPage = BasicPage;
}

Expand All @@ -33,7 +33,7 @@ export class MyApp {
// production is false unless viewed on the docs
// http://ionicframework.com/docs/v2/components/

if (this.queryParams.get('production') === 'true') {
if (this.platform.getQueryParam('production') === 'true') {
this.isProductionMode = true;

// Platform is ios by default
Expand Down
7 changes: 3 additions & 4 deletions src/pages/loading/basic/pages.ts
Expand Up @@ -11,12 +11,11 @@ export class BasicPage {
constructor(public loadingCtrl: LoadingController) { }

presentLoading() {
let loading = this.loadingCtrl.create({
content: "Please wait...",
this.loadingCtrl.create({
content: 'Please wait...',
duration: 3000,
dismissOnPageChange: true
});
loading.present();
}).present();
}

}
2 changes: 1 addition & 1 deletion src/pages/modals/basic/modal-content.html
Expand Up @@ -6,7 +6,7 @@
</ion-title>
<ion-buttons start>
<button ion-button (click)="dismiss()">
<span color="primary" showWhen="ios">Cancel</span>
<span ion-text color="primary" showWhen="ios">Cancel</span>
<ion-icon name="md-close" showWhen="android,windows"></ion-icon>
</button>
</ion-buttons>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/modals/basic/pages.ts
Expand Up @@ -25,7 +25,7 @@ export class BasicPage {
</ion-title>
<ion-buttons start>
<button ion-button (click)="dismiss()">
<span color="primary" showWhen="ios">Cancel</span>
<span ion-text color="primary" showWhen="ios">Cancel</span>
<ion-icon name="md-close" showWhen="android,windows"></ion-icon>
</button>
</ion-buttons>
Expand Down
6 changes: 5 additions & 1 deletion tsconfig.json
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"declaration": true,
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"lib": [
Expand All @@ -10,8 +10,12 @@
],
"module": "es2015",
"moduleResolution": "node",
"sourceMap": true,
"target": "es5"
},
"include": [
"src/**/*.ts"
],
"exclude": [
"node_modules"
],
Expand Down

0 comments on commit 50ae32c

Please sign in to comment.