add scroll demo to tooltip

angular · Dec 20, 2016 · 67e0684 · 67e0684
1 parent 389dbd4
commit 67e0684
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/src/demo-app/tooltip/tooltip-demo.html b/src/demo-app/tooltip/tooltip-demo.html
@@ -2,7 +2,7 @@
   <h1>Tooltip Demo</h1>
 
   <p class="centered" style="height: 200px; overflow: auto;" cdk-scrollable>
-    <button #tooltip="mdTooltip" style="margin: 300px;"
+    <button #tooltip="mdTooltip" style="margin-bottom: 300px;"
             md-raised-button
             color="primary"
             [mdTooltip]="message"
@@ -11,6 +11,7 @@ <h1>Tooltip Demo</h1>
             [mdTooltipHideDelay]="hideDelay">
       Mouse over to see the tooltip
     </button>
+    Scroll down while tooltip is open to see it hide automatically
   </p>
 
   <p>

diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts
@@ -12,5 +12,5 @@ export class TooltipDemo {
   position: TooltipPosition = 'below';
   message: string = 'Here is the tooltip';
   showDelay = 0;
-  hideDelay = 0;
+  hideDelay = 1000;
 }
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
@@ -22,19 +22,7 @@ import {FocusTrap} from '../core/a11y/focus-trap';
 import {ESCAPE} from '../core/keyboard/keycodes';
 import {OverlayModule} from '../core/overlay/overlay-directives';
 import {InteractivityChecker} from '../core/a11y/interactivity-checker';
-<<<<<<< ebeb579c60bb44de259764cd9d226ea92252671e
-<<<<<<< 38f2302c080b3941ee7be5289c9a47a0d1a3bcef
 import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
-=======
-import {MdLiveAnnouncer} from '../core/a11y/live-announcer';
-<<<<<<< 7f62f0a674630555a66a123367e701089f68e338
-import {ScrollDispatcher} from '../core/scroll/scroll-dispatcher';
->>>>>>> review response
-=======
-=======
->>>>>>> make lint happy
-import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
->>>>>>> move scroll to overlay
 
 
 /** Exception thrown when two MdSidenav are matching the same side. */