Re-add click listener for audio icon

Auditors: @jkup
brave · Dec 20, 2016 · 448604f · 448604f · bbondy · Dec 20, 2016
1 parent 28b7e58
commit 448604f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/renderer/components/tabIcon.js b/app/renderer/components/tabIcon.js
@@ -13,7 +13,7 @@ class TabIcon extends ImmutableComponent {
       styles.icon,
       this.props.withBlueIcon && styles.blueIcon
     )
-    return <div className={className}>
+    return <div className={className} onClick={this.props.onClick}>
       <span className={this.props.styles} />
     </div>
   }

diff --git a/js/components/tab.js b/js/components/tab.js
@@ -173,17 +173,15 @@ class Tab extends ImmutableComponent {
       })
     }
 
-    let playIcon = null
+    let playIcon = false
     let iconClass = null
-
     if (this.props.tab.get('audioPlaybackActive') || this.props.tab.get('audioMuted')) {
       if (this.props.tab.get('audioPlaybackActive') && !this.props.tab.get('audioMuted')) {
         iconClass = 'fa fa-volume-up'
       } else if (this.props.tab.get('audioPlaybackActive') && this.props.tab.get('audioMuted')) {
         iconClass = 'fa fa-volume-off'
       }
-      playIcon = <AudioTabIcon styles={iconClass}
-        onClick={this.onMuteFrame.bind(this, !this.props.tab.get('audioMuted'))} />
+      playIcon = true
     }
 
     const locationHasFavicon = this.props.tab.get('location') !== 'about:newtab' && this.props.tab.get('location') !== 'about:blank'
@@ -238,7 +236,12 @@ class Tab extends ImmutableComponent {
             style={iconStyle} />
           : null
         }
-        {playIcon}
+        {
+          playIcon
+          ? <AudioTabIcon styles={iconClass}
+            onClick={this.onMuteFrame.bind(this, !this.props.tab.get('audioMuted'))} />
+          : null
+        }
         {
           !this.isPinned
           ? <div className='tabTitle'>