Merge branch '2.0' into windows-mode

demos/action-sheet/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, ActionSheet, NavController, Platform} from 'ionic/ionic';
+import {App, Page, ActionSheet, NavController, Platform} from 'ionic-angular';
 
 
 @App({

demos/alert/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, Alert, NavController} from 'ionic/ionic';
+import {App, Page, Alert, NavController} from 'ionic-angular';
 
 
 @App({

demos/blur/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/button/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/checkbox/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/config/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, IonicApp, Platform, NavController} from 'ionic/ionic';
+import {App, Page, IonicApp, Platform, NavController} from 'ionic-angular';
 
 @App({
   templateUrl: 'app.html',

demos/events/index.ts

@@ -1,4 +1,4 @@
-import {App, IonicApp, Page, Events} from 'ionic/ionic';
+import {App, IonicApp, Page, Events} from 'ionic-angular';
 
 @Page({templateUrl: 'login.html'})
 class Login {

demos/hide-when/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/icon/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/id/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, MenuController} from 'ionic/ionic';
+import {App, Page, MenuController} from 'ionic-angular';
 
 @Page({templateUrl: 'page1.html'})
 class Page1 {

demos/input/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/item-sliding/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/item/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 // Uses the list's demo but passes the demo var to change the title
 @App({

demos/label/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/list/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/local-storage/index.ts

@@ -1,5 +1,5 @@
-import {App, Page, IonicApp, Config, Platform} from 'ionic/ionic';
+import {App, Page, IonicApp, Config, Platform} from 'ionic-angular';
-import {Storage, LocalStorage} from 'ionic/ionic';
+import {Storage, LocalStorage} from 'ionic-angular';
 
 
 @App({

demos/menu/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, MenuController} from 'ionic/ionic';
+import {App, Page, MenuController} from 'ionic-angular';
 
 @Page({templateUrl: 'page1.html'})
 class Page1 {

demos/modal/index.ts

@@ -1,5 +1,5 @@
-import {App, Page, IonicApp, Config, Platform, ViewController} from 'ionic/ionic';
+import {App, Page, IonicApp, Config, Platform, ViewController} from 'ionic-angular';
-import {Modal, NavController, NavParams, Animation} from 'ionic/ionic';
+import {Modal, NavController, NavParams, Animation} from 'ionic-angular';
 
 
 @App({

demos/nav-params/index.ts

@@ -1,5 +1,5 @@
-import {App, Page, IonicApp, Config, Platform} from 'ionic/ionic';
+import {App, Page, IonicApp, Config, Platform} from 'ionic-angular';
-import {NavController, NavParams} from 'ionic/ionic';
+import {NavController, NavParams} from 'ionic-angular';
 
 
 @App({

demos/navbar/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 // Use the toolbar demo but pass in the demo name to change the title
 @App({

demos/navigation/index.ts

@@ -1,5 +1,5 @@
-import {App, Page, IonicApp, Config, Platform} from 'ionic/ionic';
+import {App, Page, IonicApp, Config, Platform} from 'ionic-angular';
-import {NavController, NavParams} from 'ionic/ionic';
+import {NavController, NavParams} from 'ionic-angular';
 
 var PAGE_NUM = 2;
 
@@ -44,7 +44,7 @@ export class Page2 {
 
     pop() {
       if (PAGE_NUM > 2) {
-        PAGE_NUM--;        
+        PAGE_NUM--;
       }
       this.nav.pop();
     }

demos/platform/index.ts

@@ -1,4 +1,4 @@
-import {App, Platform} from 'ionic/ionic';
+import {App, Platform} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/radio/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/refresher/index.ts

@@ -1,4 +1,4 @@
-import {App, Page, IonicApp} from 'ionic/ionic';
+import {App, Page, IonicApp} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/scroll/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/searchbar/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/segment/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/select/index.ts

@@ -1,4 +1,4 @@
-import {App, Page} from 'ionic/ionic';
+import {App, Page} from 'ionic-angular';
 
 @Page({
   templateUrl: 'main.html'

demos/show-when/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/slides/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html',

demos/tabs/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html',

demos/textarea/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/title/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 // Use the toolbar demo but pass in the demo name to change the title
 // this will also hide some of the toolbars that don't use `ion-title`

demos/toggle/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

demos/toolbar/index.ts

@@ -1,4 +1,4 @@
-import {App} from 'ionic/ionic';
+import {App} from 'ionic-angular';
 
 @App({
   templateUrl: 'main.html'

scripts/demos/webpack.config.js

@@ -31,9 +31,8 @@ module.exports = {
   },
   resolve: {
     alias: {
-      'ionic': path.normalize(process.cwd() + '/dist')
+      'ionic-angular': path.normalize(process.cwd() + '/dist')
     },
     extensions: ["", ".js", ".ts"]
   }
 };
-

scripts/docs/dgeni-config.js

@@ -113,7 +113,7 @@ module.exports = function(currentVersion){
 
   readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
   readTypeScriptModules.sourceFiles = [
-    'ionic/ionic.ts'
+    'ionic/index.ts'
   ];
 })