1 files changed, 25 insertions, 20 deletions

diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 92d7cd835..820f8fd8e 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Client = require('../utils/client.jsx');
-const Utils = require('../utils/utils.jsx');
-const Constants = require('../utils/constants.jsx');
-const ViewImagePopoverBar = require('./view_image_popover_bar.jsx');
+import * as Client from '../utils/client.jsx';
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
+import ViewImagePopoverBar from './view_image_popover_bar.jsx';
 const Modal = ReactBootstrap.Modal;
 const KeyCodes = Constants.KeyCodes;
 
@@ -423,24 +423,29 @@ export default class ViewImageModal extends React.Component {
                     onClick={this.props.onModalDismissed}
                 >
                     <div
-                        className={'image-wrapper ' + bgClass}
-                        onMouseEnter={this.onMouseEnterImage}
-                        onMouseLeave={this.onMouseLeaveImage}
-                        onClick={(e) => e.stopPropagation()}
+                        className={'image-wrapper'}
+                        onClick={this.props.onModalDismissed}
                     >
                         <div
-                            className={closeButtonClass}
-                            onClick={this.props.onModalDismissed}
-                        />
-                        {content}
-                        <ViewImagePopoverBar
-                            show={this.state.showFooter}
-                            fileId={this.state.imgId}
-                            totalFiles={this.props.filenames.length}
-                            filename={name}
-                            fileURL={fileUrl}
-                            getPublicLink={this.getPublicLink}
-                        />
+                            className={bgClass}
+                            onMouseEnter={this.onMouseEnterImage}
+                            onMouseLeave={this.onMouseLeaveImage}
+                            onClick={(e) => e.stopPropagation()}
+                        >
+                            <div
+                                className={closeButtonClass}
+                                onClick={this.props.onModalDismissed}
+                            />
+                            {content}
+                            <ViewImagePopoverBar
+                                show={this.state.showFooter}
+                                fileId={this.state.imgId}
+                                totalFiles={this.props.filenames.length}
+                                filename={name}
+                                fileURL={fileUrl}
+                                getPublicLink={this.getPublicLink}
+                            />
+                        </div>
                     </div>
                     {leftArrow}
                     {rightArrow}