diff options
author | Thomas <tmashuang@gmail.com> | 2018-01-23 17:12:50 +0800 |
---|---|---|
committer | Thomas <tmashuang@gmail.com> | 2018-01-23 17:12:50 +0800 |
commit | 97ca86733cb49750a9909b57ac1f31bc0f49abc5 (patch) | |
tree | 9869d35d41b5b1e9e33fa9ff968afb9d1fa1f0ff /old-ui/app/components | |
parent | b62ec394f55b7bf3209cf5e1dc4721648dfc15dc (diff) | |
download | tangerine-wallet-browser-97ca86733cb49750a9909b57ac1f31bc0f49abc5.tar.gz tangerine-wallet-browser-97ca86733cb49750a9909b57ac1f31bc0f49abc5.tar.zst tangerine-wallet-browser-97ca86733cb49750a9909b57ac1f31bc0f49abc5.zip |
Merge branch 'master' into uat
Diffstat (limited to 'old-ui/app/components')
-rw-r--r-- | old-ui/app/components/loading.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js index 163792584..b8e2eb599 100644 --- a/old-ui/app/components/loading.js +++ b/old-ui/app/components/loading.js @@ -11,7 +11,7 @@ function LoadingIndicator () { } LoadingIndicator.prototype.render = function () { - const { isLoading, loadingMessage } = this.props + const { isLoading, loadingMessage, canBypass, bypass } = this.props return ( isLoading ? h('.full-flex-height', { @@ -28,6 +28,16 @@ LoadingIndicator.prototype.render = function () { background: 'rgba(255, 255, 255, 0.8)', }, }, [ + canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', { + style: { + position: 'absolute', + top: '1px', + right: '15px', + color: '#AEAEAE', + }, + onClick: bypass, + }) : null, + h('img', { src: 'images/loading.svg', }), |