Merge remote-tracking branch 'upstream/master' into PLT-589

web/react/components/channel_loader.jsx

@@ -104,12 +104,6 @@ export default class ChannelLoader extends React.Component {
             }
         });
 
-        /* Setup modal events */
-        $('.modal').on('show.bs.modal', function onShow() {
-            $('.modal-body').css('overflow-y', 'auto');
-            $('.modal-body').css('max-height', $(window).height() * 0.7);
-        });
-
         /* Prevent backspace from navigating back a page */
         $(window).on('keydown.preventBackspace', (e) => {
             if (e.which === 8 && !$(e.target).is('input, textarea')) {

web/react/components/settings_sidebar.jsx

@@ -10,7 +10,7 @@ export default class SettingsSidebar extends React.Component {
     handleClick(tab, e) {
         e.preventDefault();
         this.props.updateTab(tab.name);
-        $('.settings-modal').addClass('display--content');
+        $(e.target).closest('.settings-modal').addClass('display--content');
     }
     render() {
         let tabList = this.props.tabs.map(function makeTab(tab) {

web/react/components/view_image.jsx

@@ -195,6 +195,7 @@ export default class ViewImageModal extends React.Component {
                         target='_blank'
                     >
                         <img
+                            style={{maxHeight: this.state.imgHeight}}
                             ref='image'
                             src={this.getPreviewImagePath(filename)}
                         />
@@ -210,6 +211,7 @@ export default class ViewImageModal extends React.Component {
 
                 content = (
                     <video
+                        style={{maxHeight: this.state.imgHeight}}
                         ref='video'
                         data-setup='{}'
                         controls='controls'
@@ -334,7 +336,6 @@ export default class ViewImageModal extends React.Component {
                 >
                     <div
                         className={'image-wrapper ' + bgClass}
-                        style={{maxHeight: this.state.imgHeight}}
                         onMouseEnter={this.onMouseEnterImage}
                         onMouseLeave={this.onMouseLeaveImage}
                         onClick={(e) => e.stopPropagation()}