Merge branch '2.0' into windows-mode

This commit is contained in:
Brandy Carney
2016-02-24 17:37:42 -05:00

View File

@ -3,11 +3,11 @@ import {Animation} from '../../animations/animation';
/**
* @private
* Menu Type
* Base class which is extended by the various types. Each
* type will provide their own animations for open and close
* and registers itself with Menu.
* @private
*/
export class MenuType {
ani: Animation = new Animation();
@ -56,6 +56,7 @@ export class MenuType {
/**
* @private
* Menu Reveal Type
* The content slides over to reveal the menu underneath.
* The menu itself, which is under the content, does not move.
@ -79,6 +80,7 @@ MenuController.registerType('reveal', MenuRevealType);
/**
* @private
* Menu Push Type
* The content slides over to reveal the menu underneath.
* The menu itself also slides over to reveal its bad self.
@ -116,6 +118,7 @@ MenuController.registerType('push', MenuPushType);
/**
* @private
* Menu Overlay Type
* The menu slides over the content. The content
* itself, which is under the menu, does not move.