From 91396d629df4d68c52944aa55e51853036ec9961 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 4 Oct 2017 16:41:32 +0200
Subject: [PATCH] fix(ripple): remove unused ScrollDispatchModule

* Removes the unused ScrollDispatchModule from the `MdRippleModule`.
* Removes references to the `ViewportRuler` in the ripple unit tests.
---
 src/lib/core/ripple/index.ts       |  3 +--
 src/lib/core/ripple/ripple.spec.ts | 12 +-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts
index 15e9347f7820..4fd6ed5e9bfe 100644
--- a/src/lib/core/ripple/index.ts
+++ b/src/lib/core/ripple/index.ts
@@ -7,7 +7,6 @@
  */
 
 import {NgModule} from '@angular/core';
-import {ScrollDispatchModule} from '@angular/cdk/scrolling';
 import {PlatformModule} from '@angular/cdk/platform';
 import {MatCommonModule} from '../common-behaviors/common-module';
 import {MatRipple} from './ripple';
@@ -17,7 +16,7 @@ export {RippleRef, RippleState} from './ripple-ref';
 export {RippleConfig, RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from './ripple-renderer';
 
 @NgModule({
-  imports: [MatCommonModule, PlatformModule, ScrollDispatchModule],
+  imports: [MatCommonModule, PlatformModule],
   exports: [MatRipple, MatCommonModule],
   declarations: [MatRipple],
 })
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index b8e9c55cd62b..071973d03d76 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -1,7 +1,6 @@
 import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
@@ -13,7 +12,6 @@ describe('MatRipple', () => {
   let fixture: ComponentFixture<any>;
   let rippleTarget: HTMLElement;
   let originalBodyMargin: string | null;
-  let viewportRuler: ViewportRuler;
   let platform: Platform;
 
   /** Extracts the numeric value of a pixel size string like '123px'.  */
@@ -24,7 +22,6 @@ describe('MatRipple', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [MatRippleModule],
-      providers: [VIEWPORT_RULER_PROVIDER],
       declarations: [
         BasicRippleContainer,
         RippleContainerWithInputBindings,
@@ -34,8 +31,7 @@ describe('MatRipple', () => {
     });
   });
 
-  beforeEach(inject([ViewportRuler, Platform], (ruler: ViewportRuler, p: Platform) => {
-    viewportRuler = ruler;
+  beforeEach(inject([Platform], (p: Platform) => {
     platform = p;
 
     // Set body margin to 0 during tests so it doesn't mess up position calculations.
@@ -239,9 +235,6 @@ describe('MatRipple', () => {
 
         // Mobile safari
         window.scrollTo(pageScrollLeft, pageScrollTop);
-        // Force an update of the cached viewport geometries because IE11 emits the
-        // scroll event later.
-        viewportRuler._cacheViewportGeometry();
       });
 
       afterEach(() => {
@@ -255,9 +248,6 @@ describe('MatRipple', () => {
 
         // Mobile safari
         window.scrollTo(0, 0);
-        // Force an update of the cached viewport geometries because IE11 emits the
-        // scroll event later.
-        viewportRuler._cacheViewportGeometry();
       });
 
       it('create ripple with correct position', () => {