Updates for IE11

Author: devversion

src/lib/core/overlay/position/viewport-ruler.spec.ts

@@ -40,7 +40,9 @@ describe('ViewportRuler', () => {
 
   it('should get the viewport bounds when the page is scrolled', () => {
     document.body.appendChild(veryLargeElement);
+
     scrollTo(1500, 2000);
+    ruler.updateDocumentRectangle();
 
     let bounds = ruler.getViewportRect();
 
@@ -68,14 +70,16 @@ describe('ViewportRuler', () => {
   });
 
   it('should get the scroll position when the page is not scrolled', () => {
-    var scrollPos = ruler.getViewportScrollPosition();
+    let scrollPos = ruler.getViewportScrollPosition();
     expect(scrollPos.top).toBe(0);
     expect(scrollPos.left).toBe(0);
   });
 
   it('should get the scroll position when the page is scrolled', () => {
     document.body.appendChild(veryLargeElement);
+
     scrollTo(1500, 2000);
+    ruler.updateDocumentRectangle();
 
     // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
     // body causes karma's iframe for the test to stretch to fit that content once we attempt to
@@ -87,7 +91,7 @@ describe('ViewportRuler', () => {
       return;
     }
 
-    var scrollPos = ruler.getViewportScrollPosition();
+    let scrollPos = ruler.getViewportScrollPosition();
     expect(scrollPos.top).toBe(2000);
     expect(scrollPos.left).toBe(1500);
 

src/lib/core/overlay/position/viewport-ruler.ts

@@ -16,12 +16,12 @@ export class ViewportRuler {
   constructor(scrollDispatcher: ScrollDispatcher) {
 
     // Initially update the document rectangle.
-    this._updateDocumentRect();
+    this.updateDocumentRectangle();
 
     // Subscribe to scroll and resize events and update the document rectangle on changes.
     scrollDispatcher
       .scrolled()
-      .subscribe(() => this._updateDocumentRect());
+      .subscribe(() => this.updateDocumentRectangle());
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
@@ -67,8 +67,11 @@ export class ViewportRuler {
     return {top, left};
   }
 
-  /** Updates the cached client rectangle of the document element.*/
-  private _updateDocumentRect() {
+  /**
+   * @internal
+   * Updates the cached client rectangle of the document element.
+   */
+  updateDocumentRectangle() {
     this._documentRect = document.documentElement.getBoundingClientRect();
   }
 

src/lib/core/ripple/ripple.spec.ts

@@ -1,6 +1,7 @@
-import {TestBed, ComponentFixture, fakeAsync, tick} from '@angular/core/testing';
+import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {MdRipple, MdRippleModule} from './ripple';
+import {ViewportRuler} from '../overlay/position/viewport-ruler';
 
 
 /** Creates a DOM event to indicate that a CSS transition for the given property ended. */
@@ -60,6 +61,7 @@ describe('MdRipple', () => {
   let rippleElement: HTMLElement;
   let rippleBackground: Element;
   let originalBodyMargin: string;
+  let viewportRuler: ViewportRuler;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -72,11 +74,13 @@ describe('MdRipple', () => {
     });
   });
 
-  beforeEach(() => {
+  beforeEach(inject([ViewportRuler], (ruler: ViewportRuler) => {
+    viewportRuler = ruler;
+
     // Set body margin to 0 during tests so it doesn't mess up position calculations.
     originalBodyMargin = document.body.style.margin;
     document.body.style.margin = '0';
-  });
+  }));
 
   afterEach(() => {
     document.body.style.margin = originalBodyMargin;
@@ -228,6 +232,8 @@ describe('MdRipple', () => {
         document.documentElement.scrollTop = pageScrollTop;
         // Mobile safari
         window.scrollTo(pageScrollLeft, pageScrollTop);
+        // Force an update of the cached rectangle in the ViewportRuler.
+        viewportRuler.updateDocumentRectangle();
       });
 
       afterEach(() => {
@@ -239,6 +245,8 @@ describe('MdRipple', () => {
         document.documentElement.scrollTop = 0;
         // Mobile safari
         window.scrollTo(0, 0);
+        // Force an update of the cached rectangle in the ViewportRuler.
+        viewportRuler.updateDocumentRectangle();
       });
 
       it('create ripple with correct position', () => {