.gitignore

@@ -22,6 +22,7 @@ $RECYCLE.BIN/
 .DS_Store
 Thumbs.db
 UserInterfaceState.xcuserstate
+.env
 
 .package.tmp.json
 

CHANGELOG.md

@@ -1,3 +1,71 @@
+<a name="3.2.0"></a>
+# [3.2.0](https://github.com/driftyco/ionic/compare/v3.1.1...v3.2.0) (2017-05-10)
+
+
+### Steps to Upgrade
+
+Update your package.json to match the following dependencies, remove the existing `node_modules` directory, and then run `npm install`:
+
+```
+"dependencies": {
+  "@angular/common": "4.1.0",
+  "@angular/compiler": "4.1.0",
+  "@angular/compiler-cli": "4.1.0",
+  "@angular/core": "4.1.0",
+  "@angular/forms": "4.1.0",
+  "@angular/http": "4.1.0",
+  "@angular/platform-browser": "4.1.0",
+  "@angular/platform-browser-dynamic": "4.1.0",
+  "@ionic-native/core": "3.6.1",
+  "@ionic-native/splash-screen": "3.6.1",
+  "@ionic-native/status-bar": "3.6.1",
+  "@ionic/storage": "2.0.1",
+  "ionic-angular": "3.2.0",
+  "ionicons": "3.0.0",
+  "rxjs": "5.1.1",
+  "sw-toolbox": "3.6.0",
+  "zone.js": "0.8.10"
+},
+"devDependencies": {
+  "@ionic/app-scripts": "1.3.7",
+  "typescript": "2.2.1"
+}
+```
+
+Using v3 of the Ionic CLI? Make sure to add `@ionic/cli-plugin-ionic-angular` and `@ionic/cli-plugin-cordova` to your `devDependencies`. Read more about this on our [blog](http://blog.ionic.io/announcing-ionic-cli-v3/).
+
+
+### Bug Fixes
+
+* **button:** display box shadow correctly for Chrome ([cbe0b42](https://github.com/driftyco/ionic/commit/cbe0b42))
+* **datetime:** fix floating label with empty ion-datetime ([#11552](https://github.com/driftyco/ionic/issues/11552)) ([5a895bb](https://github.com/driftyco/ionic/commit/5a895bb)), closes [#11547](https://github.com/driftyco/ionic/issues/11547)
+* **label:** add the $label-ios-text-color sass variables back ([588fad8](https://github.com/driftyco/ionic/commit/588fad8)), closes [#11373](https://github.com/driftyco/ionic/issues/11373)
+* **module-loader:** remove null references ([2afc5cf](https://github.com/driftyco/ionic/commit/2afc5cf))
+* **nav-controller:** popToRoot should not remove root view ([646d736](https://github.com/driftyco/ionic/commit/646d736))
+* **rtl:** add correct text-align ([#11353](https://github.com/driftyco/ionic/issues/11353)) ([424b15a](https://github.com/driftyco/ionic/commit/424b15a))
+* **rtl:** change item reorder offset for RTL ([#11395](https://github.com/driftyco/ionic/issues/11395)) ([665e44f](https://github.com/driftyco/ionic/commit/665e44f))
+* **select:** fire the events properly in popover interface ([59dd853](https://github.com/driftyco/ionic/commit/59dd853))
+* **tap-click:** update setupTapClick signature ([df8d1cc](https://github.com/driftyco/ionic/commit/df8d1cc))
+* **view-controller:** set _dismissRole to a string ([6d11499](https://github.com/driftyco/ionic/commit/6d11499))
+* **virtual-scroll:** update virtualTrackBy reference ([de19dbe](https://github.com/driftyco/ionic/commit/de19dbe))
+* **virtual-scroll:** remove duplicate items ([f893aa6](https://github.com/driftyco/ionic/commit/f893aa6))
+* **virtual-scroll:** initialize differ with trackByFn ([#11492](https://github.com/driftyco/ionic/issues/11492)) ([299a68b](https://github.com/driftyco/ionic/commit/299a68b))
+
+
+### Features
+
+* **item:** deprecate item-left / item-right attributes for item-start / item-end ([#11125](https://github.com/driftyco/ionic/issues/11125)) ([26c653e](https://github.com/driftyco/ionic/commit/26c653e))
+* **select:** close select programatically ([a04b577](https://github.com/driftyco/ionic/commit/a04b577))
+* **wk:** built-in support for WK ([#11048](https://github.com/driftyco/ionic/issues/11048)) ([325cc5e](https://github.com/driftyco/ionic/commit/325cc5e))
+
+
+### Performance Improvements
+
+* **virtual-scroll:** relax the restrictions for fast path ([88e5642](https://github.com/driftyco/ionic/commit/88e5642))
+* **virtual-scroll:** fast path for removing ([8baa647](https://github.com/driftyco/ionic/commit/8baa647))
+
+
+
 <a name="3.1.1"></a>
 ## [3.1.1](https://github.com/driftyco/ionic/compare/v3.1.0...v3.1.1) (2017-04-28)
 

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ionic2",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "A powerful framework for building mobile and progressive web apps with JavaScript and Angular 2",
   "keywords": [
     "ionic",
@@ -68,6 +68,7 @@
     "del": "2.2.2",
     "dgeni": "^0.4.7",
     "dgeni-packages": "^0.16.10",
+    "dotenv": "4.0.0",
     "event-stream": "3.3.4",
     "file-loader": "0.9.0",
     "fs-extra": "^2.0.0",
@@ -120,6 +121,7 @@
     "rollup-plugin-node-resolve": "3.0.0",
     "rollup-plugin-uglify": "1.0.1",
     "run-sequence": "1.2.2",
+    "s3": "4.4.0",
     "sassdoc": "2.2.1",
     "semver": "5.3.0",
     "serve-static": "1.11.1",
@@ -144,4 +146,4 @@
   "pre-push#master": [
     "test"
   ]
-}
+}

scripts/docs/deploy.sh

@@ -19,7 +19,8 @@ function run {
   cd ..
   VERSION=$(readJsonProp "package.json" "version")
 
-  #compile API Demos
+  # download and copy over API Demos
+  ./node_modules/.bin/gulp demos.download
   ./node_modules/.bin/gulp docs.demos --production=true
 
   # if release, copy old version to seperate folder and blow out docs root api

scripts/gulp/tasks/demos.prod.ts

@@ -4,6 +4,7 @@ import * as glob from 'glob';
 import { task } from 'gulp';
 import * as del from 'del';
 import * as runSequence from 'run-sequence';
+import * as s3 from 's3';
 import { argv } from 'yargs';
 
 
@@ -12,6 +13,9 @@ import { createTempTsConfig, getFolderInfo, runAppScriptsBuild, writePolyfills }
 
 import * as pAll from 'p-all';
 
+import * as dotenv from 'dotenv';
+dotenv.config();
+
 task('demos.prepare', (done: Function) => {
   runSequence('demos.clean', 'demos.polyfill', 'demos.sass', (err: any) => done(err));
 });
@@ -95,9 +99,19 @@ function buildDemo(filePath: string) {
   const appNgModulePath = join(dirname(filePath), 'app.module.ts');
   const distDir = join(distTestRoot, 'www');
 
-  return runAppScriptsBuild(appEntryPoint, appNgModulePath, ionicAngularDir, distDir, pathToWriteFile, ionicAngularDir, sassConfigPath, copyConfigPath).then(() => {
+  return runAppScriptsBuild(
+    appEntryPoint, 
+    appNgModulePath, 
+    ionicAngularDir, 
+    distDir, 
+    pathToWriteFile, 
+    ionicAngularDir, 
+    sassConfigPath, 
+    copyConfigPath
+  ).then(() => {
     const end = Date.now();
     console.log(`${filePath} took a total of ${(end - start) / 1000} seconds to build`);
+    uploadToS3(pathToWriteFile);
   });
 }
 
@@ -112,6 +126,78 @@ function chunkArrayInGroups(arr, size) {
   return result;
 }
 
+function uploadToS3(path) {
+  // fail silently if envars not present
+  if (!process.env.AWS_KEY || !process.env.AWS_SECRET) {
+    return new Promise((resolve) => {resolve();});
+  }
+
+  let client = s3.createClient({
+    s3Options: {
+      accessKeyId: process.env.AWS_KEY,
+      secretAccessKey: process.env.AWS_SECRET
+    },
+  });
+
+  // get demo name from path
+  let demo = path.split('/')[path.split('/').length - 2];
+
+  let params = {
+    localDir: path.replace('tsconfig.json',''),
+    deleteRemoved: true, 
+    s3Params: {
+      Bucket: "ionic-demos",
+      Prefix: demo,
+    },
+  };
+
+  var uploader = client.uploadDir(params);
+
+  return new Promise((resolve, reject) => {    
+    uploader.on('error', function(err) {
+      console.error("s3 Upload Error:", err.stack);
+      reject();
+    });
+    uploader.on('end', function() {
+      console.log(demo, " demo uploaded to s3");
+      resolve();
+    });
+  });
+}
+
+task('demos.download', (done: Function) => {
+  if (!process.env.AWS_KEY || !process.env.AWS_SECRET) {
+    return new Promise((resolve) => {resolve();});
+  }
+
+  let client = s3.createClient({
+    s3Options: {
+      accessKeyId: process.env.AWS_KEY,
+      secretAccessKey: process.env.AWS_SECRET
+    },
+  });
+
+  let params = {
+    localDir: join(process.cwd(), 'dist', 'demos', 'src'),
+    s3Params: {
+      Bucket: "ionic-demos",
+    },
+  };
+
+  let uploader = client.downloadDir(params);
+
+  return new Promise((resolve, reject) => {    
+    uploader.on('error', function(err) {
+      console.error("s3 Download Error:", err.stack);
+      reject();
+    });
+    uploader.on('end', function() {
+      console.log("Demos downloaded from s3");
+      resolve();
+    });
+  });
+})
+
 task('demos.clean', (done: Function) => {
   // this is a super hack, but it works for now
   if (argv.skipClean) {

src/components/content/test/no-bounce/app/app.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: '<ion-nav [root]="root"></ion-nav>'
+})
+export class AppComponent {
+  root = RootPage;
+}

src/components/content/test/no-bounce/app/app.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent),
+    RootPageModule
+  ],
+  bootstrap: [IonicApp]
+})
+export class AppModule {}

src/components/content/test/no-bounce/pages/root-page/root-page.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ]
+})
+export class RootPageModule {}

src/components/content/test/no-bounce/pages/root-page/root-page.ts

@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { IonicPage } from '../../../../../../';
+
+@IonicPage()
+@Component({
+  templateUrl: 'root-page.html'
+})
+export class RootPage {}

src/components/label/label.ios.scss

@@ -4,10 +4,10 @@
 // --------------------------------------------------
 
 /// @prop - Text color of the label by an input, select, or datetime
-$label-ios-text-color:                 unset !default;
+$label-ios-text-color:                 null !default;
 
 /// @prop - Text color of the stacked/floating label when it is focused
-$label-ios-text-color-focused:         unset !default;
+$label-ios-text-color-focused:         null !default;
 
 /// @prop - Margin of the label
 $label-ios-margin:                     $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;

src/components/searchbar/searchbar.ts

@@ -34,7 +34,7 @@ import { Platform } from '../../platform/platform';
         '<ion-icon name="md-arrow-back"></ion-icon>' +
       '</button>' +
       '<div #searchbarIcon class="searchbar-search-icon"></div>' +
-      '<input #searchbarInput class="searchbar-input" (input)="inputChanged($event)" (blur)="inputBlurred($event)" (focus)="inputFocused($event)" ' +
+      '<input #searchbarInput class="searchbar-input" (input)="inputChanged($event)" (blur)="inputBlurred()" (focus)="inputFocused()" ' +
         '[attr.placeholder]="placeholder" ' +
         '[attr.type]="type" ' +
         '[attr.autocomplete]="_autocomplete" ' +