Skip to content

Commit 3df4e71

Browse files
committed
Fix tslint and mobile safari and firefox
1 parent a2869df commit 3df4e71

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,8 @@ export class ViewportRuler {
5050
// `scrollTop` and `scrollLeft` is inconsistent. However, using the bounding rect of
5151
// `document.documentElement` works consistently, where the `top` and `left` values will
5252
// equal negative the scroll position.
53-
const top = documentRect.top < 0 && document.body.scrollTop == 0 ?
54-
-documentRect.top :
55-
document.body.scrollTop;
56-
const left = documentRect.left < 0 && document.body.scrollLeft == 0 ?
57-
-documentRect.left :
58-
document.body.scrollLeft;
53+
const top = -documentRect.top || document.body.scrollTop || window.scrollY || 0;
54+
const left = -documentRect.left || document.body.scrollLeft || window.scrollX || 0;
5955

6056
return {top, left};
6157
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ describe('MdRipple', () => {
196196
document.body.appendChild(veryLargeElement);
197197
document.body.scrollTop = pageScrollTop;
198198
document.body.scrollLeft = pageScrollLeft;
199+
// Firefox
200+
document.documentElement.scrollLeft = pageScrollLeft;
201+
document.documentElement.scrollTop = pageScrollTop;
202+
// Mobile safari
203+
window.scrollTo(pageScrollLeft, pageScrollTop);
199204

200205
rippleElement.style.position = 'absolute';
201206
rippleElement.style.left = `${elementLeft}px`;

src/lib/core/ripple/ripple.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
ForegroundRipple,
1616
ForegroundRippleState,
1717
} from './ripple-renderer';
18-
import {ViewportRuler} from "../overlay/position/viewport-ruler";
18+
import {ViewportRuler} from '../overlay/position/viewport-ruler';
1919

2020

2121
@Directive({

src/lib/tabs/tab-nav-bar/tab-nav-bar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, Input, ViewChild, ElementRef, ViewEncapsulation, Directive} from '@angular/core';
22
import {MdInkBar} from '../ink-bar';
33
import {MdRipple} from '../../core/ripple/ripple';
4-
import {ViewportRuler} from "../../core/overlay/position/viewport-ruler";
4+
import {ViewportRuler} from '../../core/overlay/position/viewport-ruler';
55

66
/**
77
* Navigation component matching the styles of the tab group header.

0 commit comments

Comments
 (0)