diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-02-28 18:43:06 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-03-01 16:22:24 +0100 |
| commit | a229e8651d84da46ca4097948bfaa0a470565dd6 (patch) | |
| tree | 04e7f1f6dffd8b92444d4931a23177b54a11431e /gui/src/renderer | |
| parent | 159b9b8ba2be61f9b4468257ac77bc870a8ddba0 (diff) | |
| download | mullvadvpn-a229e8651d84da46ca4097948bfaa0a470565dd6.tar.xz mullvadvpn-a229e8651d84da46ca4097948bfaa0a470565dd6.zip | |
Use global.setTimeout to disambiguate from window.setTimeout
Diffstat (limited to 'gui/src/renderer')
| -rw-r--r-- | gui/src/renderer/app.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/ClipboardLabel.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/CustomScrollbars.tsx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 8b5678f0eb..7a671927e1 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -197,7 +197,7 @@ export default class AppRenderer { await IpcRendererEventChannel.account.set(accountToken); // Redirect the user after some time to allow for the 'Logged in' screen to be visible - this.loginTimer = setTimeout(async () => { + this.loginTimer = global.setTimeout(async () => { this.memoryHistory.replace('/connect'); try { @@ -640,7 +640,7 @@ export class AccountDataCache { log.warn(`Failed to fetch account data. Retrying in ${delay} ms`); - this.fetchRetryTimeout = setTimeout(() => { + this.fetchRetryTimeout = global.setTimeout(() => { this.fetchRetryTimeout = undefined; this.performFetch(accountToken); }, delay); diff --git a/gui/src/renderer/components/ClipboardLabel.tsx b/gui/src/renderer/components/ClipboardLabel.tsx index 41360340d8..fdb9982b3f 100644 --- a/gui/src/renderer/components/ClipboardLabel.tsx +++ b/gui/src/renderer/components/ClipboardLabel.tsx @@ -43,7 +43,7 @@ export default class ClipboardLabel extends Component<IProps, IState> { clearTimeout(this.timer); } - this.timer = setTimeout(() => this.setState({ showsMessage: false }), this.props.delay); + this.timer = global.setTimeout(() => this.setState({ showsMessage: false }), this.props.delay); this.setState({ showsMessage: true }); Clipboard.setText(this.props.value); diff --git a/gui/src/renderer/components/CustomScrollbars.tsx b/gui/src/renderer/components/CustomScrollbars.tsx index b2353b4014..d909dd79dd 100644 --- a/gui/src/renderer/components/CustomScrollbars.tsx +++ b/gui/src/renderer/components/CustomScrollbars.tsx @@ -313,7 +313,7 @@ export default class CustomScrollbars extends React.Component<IProps, IState> { if (this.autoHideTimer) { clearTimeout(this.autoHideTimer); } - this.autoHideTimer = setTimeout(() => { + this.autoHideTimer = global.setTimeout(() => { this.setState({ showScrollIndicators: false, showTrack: false, @@ -327,7 +327,7 @@ export default class CustomScrollbars extends React.Component<IProps, IState> { clearTimeout(this.autoHideTimer); } - this.autoHideTimer = setTimeout(() => { + this.autoHideTimer = global.setTimeout(() => { this.setState({ showTrack: false, isWide: false, |