From 75107dc15db932bbbb0df12666c0be5a64409ff6 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Wed, 1 Jun 2016 16:16:24 -0400
Subject: Fix brand image not showing up after selecting it and before
 uploading (#3197)

---
 webapp/components/admin_console/brand_image_setting.jsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'webapp')

diff --git a/webapp/components/admin_console/brand_image_setting.jsx b/webapp/components/admin_console/brand_image_setting.jsx
index 74f2290af..74d0814a6 100644
--- a/webapp/components/admin_console/brand_image_setting.jsx
+++ b/webapp/components/admin_console/brand_image_setting.jsx
@@ -40,6 +40,19 @@ export default class BrandImageSetting extends React.Component {
         });
     }
 
+    componentDidUpdate() {
+        if (this.refs.image) {
+            const reader = new FileReader();
+
+            const img = this.refs.image;
+            reader.onload = (e) => {
+                $(img).attr('src', e.target.result);
+            };
+
+            reader.readAsDataURL(this.state.brandImage);
+        }
+    }
+
     handleImageChange() {
         const element = $(this.refs.fileInput);
 
@@ -151,6 +164,7 @@ export default class BrandImageSetting extends React.Component {
                             ref='fileInput'
                             type='file'
                             accept='.jpg,.png,.bmp'
+                            disabled={this.props.disabled}
                             onChange={this.handleImageChange}
                         />
                     </div>
-- 
cgit v1.2.3-1-g7c22