Upgrade to ionic beta 9

lathonez · Jun 18, 2016 · a61432c · a61432c
1 parent 93bbcba
commit a61432c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="1.3.3"></a>
+# 1.3.3 (2016-06-18)
+
+### Features
+
+* **Update**: Update to Ionic 2.0.0.beta.9 PR ([5f8d5fb])(https://github.com/lathonez/clicker/commit/5f8d5fb20f456d2e8b98d9db1098c51588e6568e)
+
+
 <a name="1.3.2"></a>
 # 1.3.2 (2016-06-07)
 

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ See the changelog [here](https://github.com/lathonez/clicker/blob/master/CHANGEL
 ## Dependencies
 
 * **@Angular:** 2.0.0-rc.1
-* **Ionic:** 2.0.0-beta.7
+* **Ionic:** 2.0.0-beta.9
 
 External dependencies are listed here to justify their inclusion and to allow for their removal if your project isn't using the related functionality.
 

diff --git a/app/app.html b/app/app.html
@@ -1,4 +1,4 @@
-<ion-menu id="leftMenu" [content]="content">
+<ion-menu [content]="content">
 
   <ion-toolbar>
     <ion-title>Menu</ion-title>
@@ -14,4 +14,4 @@
 
 </ion-menu>
 
-<ion-nav id="nav" [root]="rootPage" #content swipe-back-enabled="false"></ion-nav>
+<ion-nav [root]="rootPage" #content swipe-back-enabled="false"></ion-nav>
diff --git a/app/app.ts b/app/app.ts
@@ -1,7 +1,7 @@
 'use strict';
 
 import { Component, Type, ViewChild }                         from '@angular/core';
-import { Platform, ionicBootstrap, MenuController, Nav } from 'ionic-angular';
+import { ionicBootstrap, MenuController, Nav, Platform }      from 'ionic-angular';
 import { StatusBar }                                          from 'ionic-native';
 import { ClickerList }                                        from './pages/clickerList/clickerList';
 import { Page2 }                                              from './pages/page2/page2';
@@ -49,9 +49,4 @@ export class ClickerApp {
   };
 }
 
-// Pass the main app component as the first argument
-// Pass any providers for your app in the second argument
-// Set any config for your app as the third argument:
-// http://ionicframework.com/docs/v2/api/config/Config/
-
-ionicBootstrap(ClickerApp, [], {});
+ionicBootstrap(ClickerApp);
diff --git a/config.xml b/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version='1.0' encoding='utf-8'?>
 <widget id="com.ionicframework.myapp107445" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>Clicker</name>
   <description>An Ionic Framework and Cordova project.</description>
@@ -23,13 +23,9 @@
   <preference name="DisallowOverscroll" value="true"/>
   <preference name="android-minSdkVersion" value="16"/>
   <preference name="BackupWebStorage" value="none"/>
+  <preference name="SplashScreenDelay" value="2000" />
+  <preference name="FadeSplashScreenDuration" value="2000"/>
   <feature name="StatusBar">
     <param name="ios-package" onload="true" value="CDVStatusBar"/>
   </feature>
-  <plugin name="cordova-plugin-device" spec="~1.1.2"/>
-  <plugin name="cordova-plugin-console" spec="~1.0.3"/>
-  <plugin name="cordova-plugin-whitelist" spec="~1.2.2"/>
-  <plugin name="cordova-plugin-splashscreen" spec="~3.2.2"/>
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.3"/>
-  <plugin name="ionic-plugin-keyboard" spec="~2.2.0"/>
 </widget>
diff --git a/ionic.config.json b/ionic.config.json
@@ -1,6 +1,6 @@
 {
   "name": "clicker",
   "app_id": "",
-  "v2": true,
-  "typescript": true
+  "typescript": true,
+  "v2": true
 }
diff --git a/package.json b/package.json
@@ -8,45 +8,45 @@
     "@angular/platform-browser-dynamic": "2.0.0-rc.1",
     "@angular/router": "2.0.0-rc.1",
     "es6-shim": "0.35.1",
-    "ionic-angular": "2.0.0-beta.8",
-    "ionic-native": "1.2.2",
+    "ionic-angular": "2.0.0-beta.9",
+    "ionic-native": "1.2.4",
     "ionicons": "3.0.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12"
   },
   "devDependencies": {
-    "browserify": "13.0.0",
+    "browserify": "13.0.1",
     "browserify-istanbul": "2.0.0",
     "codecov.io": "0.1.6",
     "del": "2.2.0",
     "gulp": "3.9.1",
     "gulp-tslint": "5.0.0",
-    "gulp-typescript": "2.13.4",
-    "gulp-watch": "4.3.5",
+    "gulp-typescript": "2.13.6",
+    "gulp-watch": "4.3.6",
     "ionic-gulp-browserify-typescript": "1.1.0",
     "ionic-gulp-fonts-copy": "1.0.0",
     "ionic-gulp-html-copy": "1.0.0",
     "ionic-gulp-sass-build": "1.0.0",
     "ionic-gulp-scripts-copy": "2.0.0",
     "isparta": "4.0.0",
     "jasmine-core": "2.4.1",
-    "jasmine-spec-reporter": "2.4.0",
+    "jasmine-spec-reporter": "2.5.0",
     "karma": "0.13.22",
     "karma-browserify": "5.0.5",
     "karma-chrome-launcher": "1.0.1",
     "karma-coverage": "1.0.0",
     "karma-jasmine": "1.0.2",
-    "karma-mocha-reporter": "2.0.3",
+    "karma-mocha-reporter": "2.0.4",
     "karma-phantomjs-launcher": "1.0.0",
     "phantomjs-prebuilt": "2.1.7",
     "protractor": "3.3.0",
-    "run-sequence": "1.2.0",
-    "ts-node": "0.7.3",
+    "run-sequence": "1.2.1",
+    "ts-node": "0.9.1",
     "tsify": "0.16.0",
     "tslint": "3.10.2",
     "tslint-eslint-rules": "1.3.0",
-    "typings": "1.0.4"
+    "typings": "1.3.0"
   },
   "name": "clicker",
   "version": "1.3.2",

diff --git a/www/index.html b/www/index.html
@@ -1,19 +1,15 @@
 <!DOCTYPE html>
-<html lang="en" dir="ltr">
+<html lang="en">
 <head>
+  <title>Ionic</title>
   <meta charset="UTF-8">
-  <title>Clickers</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <meta name="format-detection" content="telephone=no">
-  <meta name="msapplication-tap-highlight" content="no">
-
   <link ios-href="build/css/app.ios.css" rel="stylesheet">
   <link md-href="build/css/app.md.css" rel="stylesheet">
   <link wp-href="build/css/app.wp.css" rel="stylesheet">  
 </head>
 <body>
 
-  <!-- this Ionic's root component and where the app will load -->
   <ion-app></ion-app>
 
   <!-- cordova.js required for cordova apps -->