From 97ca86733cb49750a9909b57ac1f31bc0f49abc5 Mon Sep 17 00:00:00 2001
From: Thomas <tmashuang@gmail.com>
Date: Tue, 23 Jan 2018 01:12:50 -0800
Subject: Merge branch 'master' into uat

---
 old-ui/app/components/loading.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'old-ui/app/components/loading.js')

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',
       }),
-- 
cgit