Move onPageLoadAsync to utils

This commit is contained in:
Fabio Berger
2018-03-02 17:01:46 +01:00
parent 8021694b81
commit 0fbb443e4b
2 changed files with 9 additions and 9 deletions

View File

@@ -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

View File

@@ -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();
});
},
};