Merge branch 'master' into 2326/tooltip-touch-click

Author: crisbeto

.travis.yml

@@ -30,12 +30,11 @@ env:
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
     - MODE=lint
-    - MODE=extract_metadata
+    - MODE=aot
+    - MODE=payload
     - MODE=e2e
     - MODE=saucelabs_required
     - MODE=browserstack_required
-    - MODE=saucelabs_optional
-    - MODE=browserstack_optional
 
 matrix:
   fast_finish: true

CHANGELOG.md

@@ -73,7 +73,7 @@ should no longer throw an error if it is missing.
 * **scroll:** provide directive and service to listen to scrolling ([#2188](https://github.com/angular/material2/issues/2188)) ([9b68e68](https://github.com/angular/material2/commit/9b68e68))
 * **sidenav:** close via escape key and restore focus to trigger element ([#1990](https://github.com/angular/material2/issues/1990)) ([a1331ec](https://github.com/angular/material2/commit/a1331ec))
 * **tooltip:** add input for delaying show and hide ([#2101](https://github.com/angular/material2/issues/2101)) ([e85d108](https://github.com/angular/material2/commit/e85d108))
-
+* **toolbar** add responsive heights as per spec ([#2157](https://github.com/angular/material2/issues/2157)) ([78d54fc](https://github.com/angular/material2/commit/78d54fc08491ce35f9ad06dc50488cc4d4c3a5e8))
 
 ### Performance Improvements
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2016 Google, Inc.
+Copyright (c) 2017 Google, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

e2e/components/checkbox/checkbox.e2e.ts

@@ -1,20 +1,41 @@
-import {browser, by, element} from 'protractor';
+import {browser, by, element, Key} from 'protractor';
 
 describe('checkbox', function () {
+
   describe('check behavior', function () {
+
     beforeEach(function() {
       browser.get('/checkbox');
     });
-    it('should be checked when clicked, and be unchecked when clicked again', function () {
-      element(by.id('test-checkbox')).click();
-      element(by.css('input[id=input-test-checkbox]')).getAttribute('checked').then((value: string) => {
+
+    it('should be checked when clicked, and be unchecked when clicked again', () => {
+      let checkboxEl = element(by.id('test-checkbox'));
+      let inputEl = element(by.css('input[id=input-test-checkbox]'));
+
+      checkboxEl.click();
+      inputEl.getAttribute('checked').then((value: string) => {
         expect(value).toBeTruthy('Expect checkbox "checked" property to be true');
       });
 
-      element(by.id('test-checkbox')).click();
-      element(by.css('input[id=input-test-checkbox]')).getAttribute('checked').then((value: string) => {
+      checkboxEl.click();
+      inputEl.getAttribute('checked').then((value: string) => {
+        expect(value).toBeFalsy('Expect checkbox "checked" property to be false');
+      });
+    });
+
+    it('should toggle the checkbox when pressing space', () => {
+      let inputEl = element(by.css('input[id=input-test-checkbox]'));
+
+      inputEl.getAttribute('checked').then((value: string) => {
         expect(value).toBeFalsy('Expect checkbox "checked" property to be false');
       });
+
+      inputEl.sendKeys(Key.SPACE);
+
+      inputEl.getAttribute('checked').then((value: string) => {
+        expect(value).toBeTruthy('Expect checkbox "checked" property to be true');
+      });
     });
+
   });
 });

e2e/components/fullscreen/fullscreen.e2e.ts

@@ -0,0 +1,38 @@
+import {browser, by, element, Key, ProtractorBy} from 'protractor';
+
+describe('fullscreen', () => {
+  beforeEach(() => browser.get('/fullscreen'));
+
+  let overlayInBody = () =>
+    browser.isElementPresent(by.css('body > .cdk-overlay-container') as ProtractorBy);
+  let overlayInFullscreen = () =>
+    browser.isElementPresent(by.css('#fullscreenpane > .cdk-overlay-container') as ProtractorBy);
+
+  it('should open a dialog inside a fullscreen element and move it to the document body', () => {
+    element(by.id('fullscreen')).click();
+    element(by.id('dialog')).click();
+
+    overlayInFullscreen().then((isPresent: boolean) => {
+        expect(isPresent).toBe(true);
+        element(by.id('exitfullscreenindialog')).click();
+        overlayInBody().then((isPresent: boolean) => {
+            expect(isPresent).toBe(true);
+        });
+    });
+  });
+
+  it('should open a dialog inside the document body and move it to a fullscreen element', () => {
+    element(by.id('dialog')).click();
+    overlayInBody().then((isPresent: boolean) => {
+        expect(isPresent).toBe(true);
+        element(by.id('fullscreenindialog')).click();
+        overlayInFullscreen().then((isPresent: boolean) => {
+            expect(isPresent).toBe(true);
+            element(by.id('exitfullscreenindialog')).click();
+            overlayInBody().then((isPresent: boolean) => {
+                expect(isPresent).toBe(true);
+            });
+        });
+    });
+  });
+});

e2e/components/menu/menu.e2e.ts

@@ -46,8 +46,6 @@ describe('menu', () => {
     page.backdrop().click();
     page.expectMenuPresent(false);
 
-    // TODO(kara): temporary, remove when #1607 is fixed
-    browser.sleep(250);
     page.trigger().click();
     expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
     page.expectMenuAlignedWith(page.menu(), 'trigger');

e2e/tsconfig.json

@@ -13,7 +13,7 @@
     "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "../node_modules/@types/"
+      "../node_modules/@types"
     ],
     "types": [
       "jasmine"

guides/getting-started.md

@@ -37,10 +37,10 @@ export class PizzaPartyAppModule { }
 This is **required** to apply all of the core and theme styles to your application. You can either
 use a pre-built theme, or define your own custom theme.
 
-:trident:  See the [theming guide](guides/theming.md) for instructions.
+:trident:  See the [theming guide](./theming.md) for instructions.
 
 ### Additional setup for gestures
-Some components ()`md-slide-toggle`, `md-slider`, `mdTooltip`) rely on 
+Some components (`md-slide-toggle`, `md-slider`, `mdTooltip`) rely on 
 [HammerJS](http://hammerjs.github.io/) for gestures. In order to get the full feature-set of these
 components, HammerJS must be loaded into the application.
 

package.json

@@ -58,6 +58,7 @@
     "dgeni": "^0.4.2",
     "dgeni-packages": "^0.16.2",
     "express": "^4.14.0",
+    "firebase-admin": "^4.0.4",
     "firebase-tools": "^2.2.1",
     "fs-extra": "^0.26.5",
     "glob": "^6.0.4",
@@ -67,15 +68,15 @@
     "gulp-clean": "^0.3.2",
     "gulp-clean-css": "^2.3.0",
     "gulp-cli": "^1.2.2",
+    "gulp-connect": "^5.0.0",
     "gulp-htmlmin": "^3.0.0",
     "gulp-if": "^2.0.2",
     "gulp-markdown": "^1.2.0",
     "gulp-sass": "^2.3.2",
-    "gulp-server-livereload": "^1.8.2",
     "gulp-shell": "^0.5.2",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-transform": "^1.1.0",
-    "gulp-typescript": "^2.13.6",
+    "gulp-typescript": "^3.1.3",
     "hammerjs": "^2.0.8",
     "highlight.js": "^9.9.0",
     "jasmine-core": "^2.4.1",
@@ -85,6 +86,7 @@
     "karma-firefox-launcher": "^1.0.0",
     "karma-jasmine": "^1.0.2",
     "karma-sauce-launcher": "^1.0.0",
+    "karma-sourcemap-loader": "^0.3.7",
     "madge": "^0.6.0",
     "merge2": "^1.0.2",
     "minimist": "^1.2.0",
@@ -97,11 +99,12 @@
     "strip-ansi": "^3.0.0",
     "stylelint": "^7.7.0",
     "symlink-or-copy": "^1.0.1",
-    "travis-after-modes": "0.0.6-2",
+    "travis-after-modes": "0.0.7",
     "ts-node": "^0.7.3",
     "tslint": "^3.13.0",
     "typedoc": "^0.5.1",
     "typescript": "~2.0.10",
+    "uglify-js": "^2.7.5",
     "which": "^1.2.4"
   }
 }

scripts/browserstack/start-tunnel.sh

@@ -33,8 +33,8 @@ rm $TUNNEL_FILE
 ARGS=""
 
 # Set tunnel-id only on Travis, to make local testing easier.
-if [ ! -z "$TRAVIS_JOB_NUMBER" ]; then
-  ARGS="$ARGS --local-identifier $TRAVIS_JOB_NUMBER"
+if [ ! -z "$TRAVIS_JOB_ID" ]; then
+  ARGS="$ARGS --local-identifier $TRAVIS_JOB_ID"
 fi
 
 echo "Starting Browserstack Local in the background, logging into:"

scripts/ci/build-and-test.sh

@@ -17,8 +17,10 @@ if is_lint; then
   $(npm bin)/gulp ci:lint
 elif is_e2e; then
   $(npm bin)/gulp ci:e2e
-elif is_extract_metadata; then
-  $(npm bin)/gulp ci:extract-metadata
+elif is_aot; then
+  $(npm bin)/gulp ci:aot
+elif is_payload; then
+  $(npm bin)/gulp ci:payload
 else
   $(npm bin)/gulp ci:test
 fi

scripts/ci/sources/mode.sh

@@ -9,6 +9,10 @@ is_lint() {
   [[ "$MODE" = lint ]]
 }
 
-is_extract_metadata() {
-  [[ "$MODE" = extract_metadata ]]
+is_aot() {
+  [[ "$MODE" = aot ]]
 }
+
+is_payload() {
+  [[ "$MODE" = payload ]]
+}

scripts/saucelabs/start-tunnel.sh

@@ -2,58 +2,43 @@
 
 set -e -o pipefail
 
-# Setup and start Sauce Connect for your TravisCI build
-# This script requires your .travis.yml to include the following two private env variables:
-# SAUCE_USERNAME
-# SAUCE_ACCESS_KEY
-# Follow the steps at https://saucelabs.com/opensource/travis to set that up.
-#
-# Curl and run this script as part of your .travis.yml before_script section:
-# before_script:
-#   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
-
-CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="sc-latest-linux.tar.gz"
-
-CONNECT_LOG="$LOGS_DIR/sauce-connect"
-CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
-CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
-
-# Get the appropriate URL for downloading Sauce Connect
-if [ `uname -s` = "Darwin" ]; then
-  # If the user is running Mac, download the OSX version
-  # https://en.wikipedia.org/wiki/Darwin_(operating_system)
-  CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.2-osx.zip"
-else
-  # Otherwise, default to Linux for Travis-CI
-  CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.2-linux.tar.gz"
-fi
-mkdir -p $CONNECT_DIR
-cd $CONNECT_DIR
-curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
-mkdir sauce-connect
-tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 --directory=sauce-connect > /dev/null
-rm $CONNECT_DOWNLOAD
+TUNNEL_FILE="sc-4.4.2-linux.tar.gz"
+TUNNEL_URL="https://saucelabs.com/downloads/$TUNNEL_FILE"
+TUNNEL_DIR="/tmp/saucelabs-connect"
 
+TUNNEL_LOG="$LOGS_DIR/sauce-connect"
 
 SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
 
+# Cleanup and create the folder structure for the tunnel connector.
+rm -rf $TUNNEL_DIR $BROWSER_PROVIDER_READY_FILE
+mkdir -p $TUNNEL_DIR
+
+cd $TUNNEL_DIR
+
+# Download the saucelabs connect binaries.
+curl $TUNNEL_URL -o $TUNNEL_FILE 2> /dev/null 1> /dev/null
+
+# Extract the saucelabs connect binaries from the tarball.
+mkdir -p sauce-connect
+tar --extract --file=$TUNNEL_FILE --strip-components=1 --directory=sauce-connect > /dev/null
+
+# Cleanup the download directory.
+rm $TUNNEL_FILE
+
 ARGS=""
 
 # Set tunnel-id only on Travis, to make local testing easier.
-if [ ! -z "$TRAVIS_JOB_NUMBER" ]; then
-  ARGS="$ARGS --tunnel-identifier $TRAVIS_JOB_NUMBER"
+if [ ! -z "$TRAVIS_JOB_ID" ]; then
+  ARGS="$ARGS --tunnel-identifier $TRAVIS_JOB_ID"
 fi
 if [ ! -z "$BROWSER_PROVIDER_READY_FILE" ]; then
   ARGS="$ARGS --readyfile $BROWSER_PROVIDER_READY_FILE"
 fi
 
-
 echo "Starting Sauce Connect in the background, logging into:"
-echo "  $CONNECT_LOG"
-echo "  $CONNECT_STDOUT"
-echo "  $CONNECT_STDERR"
+echo "  $TUNNEL_LOG"
 echo "  ---"
 echo "  $ARGS"
-sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
-  --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
+
+sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS --logfile $TUNNEL_LOG &

src/demo-app/autocomplete/autocomplete-demo.html

@@ -1,3 +1,9 @@
 <div class="demo-autocomplete">
-  <md-autocomplete></md-autocomplete>
+  <md-input-container>
+    <input mdInput placeholder="State" [mdAutocomplete]="auto">
+  </md-input-container>
+
+  <md-autocomplete #auto="mdAutocomplete">
+    <md-option *ngFor="let state of states" [value]="state.code"> {{ state.name }} </md-option>
+  </md-autocomplete>
 </div>

src/demo-app/autocomplete/autocomplete-demo.ts

@@ -6,4 +6,33 @@ import {Component} from '@angular/core';
   templateUrl: 'autocomplete-demo.html',
   styleUrls: ['autocomplete-demo.css'],
 })
-export class AutocompleteDemo {}
+export class AutocompleteDemo {
+  states = [
+    {code: 'AL', name: 'Alabama'},
+    {code: 'AZ', name: 'Arizona'},
+    {code: 'CA', name: 'California'},
+    {code: 'CO', name: 'Colorado'},
+    {code: 'CT', name: 'Connecticut'},
+    {code: 'FL', name: 'Florida'},
+    {code: 'GA', name: 'Georgia'},
+    {code: 'ID', name: 'Idaho'},
+    {code: 'KS', name: 'Kansas'},
+    {code: 'LA', name: 'Louisiana'},
+    {code: 'MA', name: 'Massachusetts'},
+    {code: 'MN', name: 'Minnesota'},
+    {code: 'MI', name: 'Mississippi'},
+    {code: 'NY', name: 'New York'},
+    {code: 'NC', name: 'North Carolina'},
+    {code: 'OK', name: 'Oklahoma'},
+    {code: 'OH', name: 'Ohio'},
+    {code: 'OR', name: 'Oregon'},
+    {code: 'PA', name: 'Pennsylvania'},
+    {code: 'SC', name: 'South Carolina'},
+    {code: 'TN', name: 'Tennessee'},
+    {code: 'TX', name: 'Texas'},
+    {code: 'VA', name: 'Virginia'},
+    {code: 'WA', name: 'Washington'},
+    {code: 'WI', name: 'Wisconsin'},
+    {code: 'WY', name: 'Wyoming'},
+  ];
+}

src/demo-app/baseline/baseline-demo.html

@@ -13,7 +13,7 @@
     <md-input placeholder="Input"></md-input>
     | Text 5 |
     <md-input-container>
-      <input md-input placeholder="Input">
+      <input mdInput placeholder="Input">
     </md-input-container>
     | Text After
   </md-card-content>
@@ -35,7 +35,7 @@ <h1>
       <md-input placeholder="Input"></md-input>
       | Text 5 |
       <md-input-container>
-        <input md-input placeholder="Input">
+        <input mdInput placeholder="Input">
       </md-input-container>
       | Text After
     </h1>