Merge pull request #74 from brave/audio-indicator-mute-tab

Remove AppStore access directly from AppActions
brave · Dec 20, 2015 · 91d70b1 · 91d70b1
2 parents 2b36b9b + 0f55676
commit 91d70b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -8,7 +8,6 @@ const AppDispatcher = require('../dispatcher/appDispatcher')
 const AppConstants = require('../constants/appConstants')
 const Config = require('../constants/config')
 const UrlUtil = require('../../node_modules/urlutil.js/dist/node-urlutil.js')
-const AppStore = require('../stores/appStore')
 const ipc = global.require('electron').ipcRenderer
 const messages = require('../constants/messages')
 
@@ -139,8 +138,14 @@ const AppActions = {
     ipc.send(messages.NEW_WINDOW)
   },
 
-  closeFrame: function (frameProps) {
-    if (AppStore.getFrameCount() > 1) {
+  /**
+   * Dispatches a message to close a frame
+   *
+   * @param {Object[]} frames - Immutable list of of all the frames
+   * @param {Object} frameProps - The properties of the frame to close
+   */
+  closeFrame: function (frames, frameProps) {
+    if (frames.size > 1) {
       AppDispatcher.dispatch({
         actionType: AppConstants.APP_CLOSE_FRAME,
         frameProps

diff --git a/js/components/main.js b/js/components/main.js
@@ -48,8 +48,8 @@ class Main extends ImmutableComponent {
     })
 
     ipc.on(messages.SHORTCUT_CLOSE_FRAME, (e, i) => typeof i !== 'undefined'
-      ? AppActions.closeFrame(FrameStateUtil.getFrameByKey(self.props.browser, i))
-      : AppActions.closeFrame())
+      ? AppActions.closeFrame(self.props.browser.get('frames'), FrameStateUtil.getFrameByKey(self.props.browser, i))
+      : AppActions.closeFrame(self.props.browser.get('frames')))
     ipc.on(messages.SHORTCUT_UNDO_CLOSED_FRAME, () => AppActions.undoClosedFrame())
 
     const self = this

diff --git a/js/components/tabs.js b/js/components/tabs.js
@@ -100,7 +100,7 @@ class Tab extends ImmutableComponent {
   }
 
   onCloseFrame () {
-    AppActions.closeFrame(this.props.frameProps)
+    AppActions.closeFrame(this.props.frames, this.props.frameProps)
   }
 
   onMuteFrame (muted) {
@@ -223,6 +223,7 @@ class Tabs extends ImmutableComponent {
           frames.map(frameProps => <Tab
             activeDraggedTab={this.props.tabs.get('activeDraggedTab')}
             frameProps={frameProps}
+            frames={this.props.frames}
             key={'tab-' + frameProps.get('key')}
             isActive={this.props.activeFrame === frameProps}
             isPrivate={frameProps.get('isPrivate')}