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

# Conflicts:
#	src/lib/tooltip/tooltip.spec.ts
#	src/lib/tooltip/tooltip.ts

Author: crisbeto

.gitignore

@@ -33,4 +33,4 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
-/.chrome
+/.chrome

CODING_STANDARDS.md

@@ -43,8 +43,8 @@ if (!$attrs['tabindex']) {
 For example, rather than doing this:
 ```html
 <md-button>Basic button</md-button>
-<md-button class="md-fab">FAB</md-button>
-<md-button class="md-icon-button">pony</md-button>
+<md-button class="mat-fab">FAB</md-button>
+<md-button class="mat-icon-button">pony</md-button>
 ```
 
 do this:
@@ -192,13 +192,13 @@ code organization.** This will allow users to much more easily override styles.
 
 For example, rather than doing this:
 ```scss
-md-calendar {
+.mat-calendar {
   display: block;
 
-  .md-month {
+  .mat-month {
     display: inline-block;
 
-    .md-date.md-selected {
+    .mat-date.mat-selected {
       font-weight: bold;
     }
   }
@@ -207,15 +207,15 @@ md-calendar {
 
 do this:
 ```scss
-md-calendar {
+.mat-calendar {
   display: block;
 }
 
-.md-calendar-month {
+.mat-calendar-month {
   display: inline-block;
 }
 
-.md-calendar-date.md-selected {
+.mat-calendar-date.mat-selected {
   font-weight: bold;
 }
 ```
@@ -260,11 +260,11 @@ This is a low-effort task that makes a big difference for low-vision users. Exam
 When it is not super obvious, include a brief description of what a class represents. For example:
 ```scss
 // The calendar icon button used to open the calendar pane.
-.md-datepicker-button { ... }
+.mat-datepicker-button { ... }
 
 // Floating pane that contains the calendar at the bottom of the input.
-.md-datepicker-calendar-pane { ... }
+.mat-datepicker-calendar-pane { ... }
 
 // Portion of the floating panel that sits, invisibly, on top of the input.
-.md-datepicker-input-mask { }
+.mat-datepicker-input-mask { }
 ``` 

README.md

@@ -75,7 +75,7 @@ High level items planned for January 2017:
 | dialog           |                           Available | [README][22] |   [#114][0114] |
 | snackbar / toast |                           Available | [README][21] |   [#115][0115] |
 | select           |                           Available | [README][23] |   [#118][0118] |
-| textarea         |                           Available |           -  |              - |
+| textarea         |                           Available | [README][5]  |              - |
 | autocomplete     |                         In-progress |           -  |   [#117][0117] |
 | chips            |  Initial version, features evolving |           -  |   [#120][0120] |
 | theming          |   Available, need guidance overlays | [Guide][20]  |              - |

e2e/components/dialog/dialog.e2e.ts

@@ -11,6 +11,12 @@ describe('dialog', () => {
     expectToExist('md-dialog-container');
   });
 
+  it('should open a template dialog', () => {
+    expectToExist('.my-template-dialog', false);
+    element(by.id('template')).click();
+    expectToExist('.my-template-dialog');
+  });
+
   it('should close by clicking on the backdrop', () => {
     element(by.id('default')).click();
 

e2e/components/fullscreen/fullscreen.e2e.ts

@@ -1,38 +1,38 @@
-import {browser, by, element, Key, ProtractorBy} from 'protractor';
+import {browser, by, element} 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);
+  beforeEach(() => browser.get('/fullscreen'));
 
   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);
-        });
-    });
+    expectOverlayInFullscreen();
+
+    element(by.id('exitfullscreenindialog')).click();
+    expectOverlayInBody();
   });
 
   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);
-            });
-        });
-    });
+    expectOverlayInBody();
+
+    element(by.id('fullscreenindialog')).click();
+    expectOverlayInFullscreen();
+
+    element(by.id('exitfullscreenindialog')).click();
+    expectOverlayInBody();
   });
+
+  /** Expects the overlay container to be inside of the body element. */
+  function expectOverlayInBody() {
+    expect(browser.isElementPresent(by.css('body > .cdk-overlay-container'))).toBe(true);
+  }
+
+  /** Expects the overlay container to be in fullscreen mode. */
+  function expectOverlayInFullscreen() {
+    expect(browser.isElementPresent(by.css('#fullscreenpane > .cdk-overlay-container'))).toBe(true);
+  }
+
 });

e2e/components/menu/menu-page.ts

@@ -3,7 +3,7 @@ import {browser, by, element, ElementFinder} from 'protractor';
 export class MenuPage {
   constructor() { browser.get('/menu'); }
 
-  menu(): ElementFinder { return element(by.css('.md-menu-panel')); }
+  menu(): ElementFinder { return element(by.css('.mat-menu-panel')); }
 
   start(): ElementFinder { return element(by.id('start')); }
 
@@ -23,11 +23,11 @@ export class MenuPage {
 
   combinedTrigger(): ElementFinder { return element(by.id('combined-t')); }
 
-  beforeMenu(): ElementFinder { return element(by.css('.md-menu-panel.before')); }
+  beforeMenu(): ElementFinder { return element(by.css('.mat-menu-panel.before')); }
 
-  aboveMenu(): ElementFinder { return element(by.css('.md-menu-panel.above')); }
+  aboveMenu(): ElementFinder { return element(by.css('.mat-menu-panel.above')); }
 
-  combinedMenu(): ElementFinder { return element(by.css('.md-menu-panel.combined')); }
+  combinedMenu(): ElementFinder { return element(by.css('.mat-menu-panel.combined')); }
 
   getResultText() { return this.textArea().getText(); }
 }

e2e/components/menu/menu.e2e.ts

@@ -1,10 +1,10 @@
-import {browser, Key, protractor} from 'protractor';
+import {Key, protractor} from 'protractor';
 import {MenuPage} from './menu-page';
 import {expectToExist, expectAlignedWith, expectFocusOn, expectLocation} from '../../util/asserts';
 import {pressKeys} from '../../util/actions';
 
 describe('menu', () => {
-  const menuSelector = '.md-menu-panel';
+  const menuSelector = '.mat-menu-panel';
   let page: MenuPage;
 
   beforeEach(() => page = new MenuPage());
@@ -60,7 +60,7 @@ describe('menu', () => {
   it('should mirror classes on host to menu template in overlay', () => {
     page.trigger().click();
     page.menu().getAttribute('class').then((classes: string) => {
-      expect(classes).toContain('md-menu-panel custom');
+      expect(classes).toContain('mat-menu-panel custom');
     });
   });
 

e2e/components/radio/radio.e2e.ts

@@ -7,7 +7,7 @@ describe('radio', () => {
     it('should be checked when clicked', () => {
       element(by.id('water')).click();
       element(by.id('water')).getAttribute('class').then((value: string) => {
-        expect(value).toContain('md-radio-checked');
+        expect(value).toContain('mat-radio-checked');
       });
       element(by.css('input[id=water-input]')).getAttribute('checked').then((value: string) => {
         expect(value).toBeTruthy();
@@ -18,7 +18,7 @@ describe('radio', () => {
 
       element(by.id('leaf')).click();
       element(by.id('leaf')).getAttribute('class').then((value: string) => {
-        expect(value).toContain('md-radio-checked');
+        expect(value).toContain('mat-radio-checked');
       });
       element(by.css('input[id=leaf-input]')).getAttribute('checked').then((value: string) => {
         expect(value).toBeTruthy();
@@ -32,15 +32,15 @@ describe('radio', () => {
       element(by.id('toggle-disable')).click();
       element(by.id('water')).click();
       element(by.id('water')).getAttribute('class').then((value: string) => {
-        expect(value).toContain('md-radio-disabled');
+        expect(value).toContain('mat-radio-disabled');
       });
         element(by.css('input[id=water-input]')).getAttribute('disabled').then((value: string) => {
         expect(value).toBeTruthy();
       });
 
       element(by.id('leaf')).click();
       element(by.id('leaf')).getAttribute('class').then((value: string) => {
-        expect(value).toContain('md-radio-disabled');
+        expect(value).toContain('mat-radio-disabled');
       });
       element(by.css('input[id=leaf-input]')).getAttribute('disabled').then((value: string) => {
         expect(value).toBeTruthy();

e2e/components/slide-toggle/slide-toggle.e2e.ts

@@ -43,7 +43,7 @@ describe('slide-toggle', () => {
 
   it('should move the thumb on state change', () => {
     let slideToggleEl = getNormalToggle();
-    let thumbEl = element(by.css('#normal-slide-toggle .md-slide-toggle-thumb-container'));
+    let thumbEl = element(by.css('#normal-slide-toggle .mat-slide-toggle-thumb-container'));
 
     let previousX = thumbEl.getLocation().then(pos => pos.x);
 

e2e/components/tabs/tabs.e2e.ts

@@ -10,7 +10,7 @@ describe('tabs', () => {
     beforeEach(() => {
       browser.get('/tabs');
       tabGroup = element(by.css('md-tab-group'));
-      tabLabels = element.all(by.css('.md-tab-label'));
+      tabLabels = element.all(by.css('.mat-tab-label'));
       tabBodies = element.all(by.css('md-tab-body'));
     });
 
@@ -67,12 +67,12 @@ function getFocusStates(elements: ElementArrayFinder) {
 
 /** Returns an array of true/false that represents the active states for the provided elements. */
 function getLabelActiveStates(elements: ElementArrayFinder) {
-  return getClassStates(elements, 'md-tab-label-active');
+  return getClassStates(elements, 'mat-tab-label-active');
 }
 
 /** Returns an array of true/false that represents the active states for the provided elements */
 function getBodyActiveStates(elements: ElementArrayFinder) {
-  return getClassStates(elements, 'md-tab-body-active');
+  return getClassStates(elements, 'mat-tab-body-active');
 }
 
 /**

e2e/screenshot.ts

@@ -1,5 +1,4 @@
 import * as fs from 'fs';
-import * as gulp from 'gulp';
 import * as path from 'path';
 import {browser} from 'protractor';
 

guides/theming.md

@@ -41,7 +41,7 @@ The actual path will depend on your server setup.
 You can also concatenate the file with the rest of your application's css.
 
 Finally, if your app's content **is not** placed inside of a `md-sidenav-container` element, you
-need to add the `md-app-background` class to your wrapper element (for example the `body`). This
+need to add the `mat-app-background` class to your wrapper element (for example the `body`). This
 ensures that the proper theme background is applied to your page.
 
 ### Defining a custom theme
@@ -55,19 +55,19 @@ the corresponding styles. A typical theme file will look something like this:
 
 // Include the base styles for Angular Material core. We include this here so that you only
 // have to load a single css file for Angular Material in your app.
-@include md-core();
+@include mat-core();
 
 // Define the palettes for your theme using the Material Design palettes available in palette.scss
 // (imported above). For each palette, you can optionally specify a default, lighter, and darker
 // hue.
-$candy-app-primary: md-palette($md-indigo);
-$candy-app-accent:  md-palette($md-pink, A200, A100, A400);
+$candy-app-primary: mat-palette($mat-indigo);
+$candy-app-accent:  mat-palette($mat-pink, A200, A100, A400);
 
 // The warn palette is optional (defaults to red).
-$candy-app-warn:    md-palette($md-red);
+$candy-app-warn:    mat-palette($mat-red);
 
 // Create the theme object (a Sass map containing all of the palettes).
-$candy-app-theme: md-light-theme($candy-app-primary, $candy-app-accent, $candy-app-warn);
+$candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent, $candy-app-warn);
 
 // Include theme styles for core and each component used in your app.
 // Alternatively, you can import and @include the theme mixins for each component
@@ -96,11 +96,11 @@ some selector. For example, we could append the following to the example above t
 secondary dark theme:
 ```scss
 .unicorn-dark-theme {
-  $dark-primary: md-palette($md-blue-grey);
-  $dark-accent:  md-palette($md-amber, A200, A100, A400);
-  $dark-warn:    md-palette($md-deep-orange);
+  $dark-primary: mat-palette($mat-blue-grey);
+  $dark-accent:  mat-palette($mat-amber, A200, A100, A400);
+  $dark-warn:    mat-palette($mat-deep-orange);
 
-  $dark-theme: md-dark-theme($dark-primary, $dark-accent, $dark-warn);
+  $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
 
   @include angular-material-theme($dark-theme);
 }