diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-03 00:01:46 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-03-03 00:01:46 +0800 |
commit | 0fbb443e4bb3ee6d522f4a4099aacae1b3da2488 (patch) | |
tree | f962c1c711da7a9c5bf478f361ad45b058b1f7ea | |
parent | 8021694b81dd94c4ea75001476b0ab57e8e45e1c (diff) | |
download | dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.tar dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.tar.gz dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.tar.bz2 dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.tar.lz dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.tar.xz dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.tar.zst dexon-0x-contracts-0fbb443e4bb3ee6d522f4a4099aacae1b3da2488.zip |
Move onPageLoadAsync to utils
-rw-r--r-- | packages/website/ts/blockchain.ts | 10 | ||||
-rw-r--r-- | packages/website/ts/utils/utils.ts | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 85b4e892f..156dc44e8 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -69,14 +69,6 @@ export class Blockchain { private _cachedProviderNetworkId: number; private _ledgerSubprovider: LedgerWalletSubprovider; private _defaultGasPrice: BigNumber; - private static async _onPageLoadAsync(): Promise<void> { - if (document.readyState === 'complete') { - return; // Already loaded - } - return new Promise<void>((resolve, reject) => { - window.onload = () => resolve(); - }); - } private static _getNameGivenProvider(provider: Web3.Provider): string { if (!_.isUndefined((provider as any).isMetaMask)) { return constants.PROVIDER_NAME_METAMASK; @@ -710,7 +702,7 @@ export class Blockchain { return tokenByAddress; } private async _onPageLoadInitFireAndForgetAsync() { - await Blockchain._onPageLoadAsync(); // wait for page to load + await utils.onPageLoadAsync(); // wait for page to load // Hack: We need to know the networkId the injectedWeb3 is connected to (if it is defined) in // order to properly instantiate the web3Wrapper. Since we must use the async call, we cannot diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 4d04d915d..27cd87be1 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -309,4 +309,12 @@ export const utils = { containerId, }); }, + async onPageLoadAsync(): Promise<void> { + if (document.readyState === 'complete') { + return; // Already loaded + } + return new Promise<void>((resolve, reject) => { + window.onload = () => resolve(); + }); + }, }; |