Merge pull request #3630 from brave/window-blur

add a null page view when all windows lose focus
brave · Sep 4, 2016 · a988d59 · a988d59
2 parents a00b0df + 3011f57
commit a988d59
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 2 deletions.
diff --git a/app/extensions.js b/app/extensions.js
@@ -13,6 +13,9 @@ let generateBraveManifest = () => {
     name: 'brave',
     manifest_version: 2,
     version: '1.0',
+    background: {
+      scripts: [ 'content/scripts/idleHandler.js' ]
+    },
     content_scripts: [
       {
         run_at: 'document_start',
@@ -90,7 +93,7 @@ let generateBraveManifest = () => {
       }
     ],
     permissions: [
-      'externally_connectable.all_urls', 'tabs', '<all_urls>', 'contentSettings'
+      'externally_connectable.all_urls', 'tabs', '<all_urls>', 'contentSettings', 'idle'
     ],
     externally_connectable: {
       matches: [

diff --git a/app/extensions/brave/content/scripts/idleHandler.js b/app/extensions/brave/content/scripts/idleHandler.js
@@ -0,0 +1,7 @@
+chrome.idle.setDetectionInterval(15*60)
+chrome.idle.onStateChanged.addListener((idleState) => {
+  chrome.ipc.send('dispatch-action', JSON.stringify({
+    actionType: 'app-idle-state-changed',
+    idleState
+  }))
+})
diff --git a/docs/appActions.md b/docs/appActions.md
@@ -390,6 +390,16 @@ Remove credit card data
 
 
 
+### windowBlurred(appWindowId) 
+
+Dispatches a message when appWindowId loses focus
+
+**Parameters**
+
+**appWindowId**: `Number`, the unique id of the window
+
+
+
 
 * * *
 

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -449,6 +449,18 @@ const appActions = {
       actionType: AppConstants.APP_REMOVE_AUTOFILL_CREDIT_CARD,
       detail
     })
+  },
+
+  /**
+   * Dispatches a message when appWindowId loses focus
+   *
+   * @param {Number} appWindowId - the unique id of the window
+   */
+  windowBlurred: function (appWindowId) {
+    AppDispatcher.dispatch({
+      actionType: AppConstants.APP_WINDOW_BLURRED,
+      appWindowId: appWindowId
+    })
   }
 }
 

diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
@@ -41,7 +41,9 @@ const AppConstants = {
   APP_ADD_AUTOFILL_CREDIT_CARD: _,
   APP_REMOVE_AUTOFILL_CREDIT_CARD: _,
   APP_SET_LOGIN_REQUIRED_DETAIL: _,
-  APP_SET_LOGIN_RESPONSE_DETAIL: _
+  APP_SET_LOGIN_RESPONSE_DETAIL: _,
+  APP_WINDOW_BLURRED: _,
+  APP_IDLE_STATE_CHANGED: _
 }
 
 module.exports = mapValuesByKeys(AppConstants)
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -151,6 +151,10 @@ const createWindow = (browserOpts, defaults, frameOpts, windowState) => {
     mainWindow.setFullScreen(true)
   }
 
+  mainWindow.on('blur', function () {
+    appActions.windowBlurred(mainWindow.id)
+  })
+
   mainWindow.on('focus', function () {
     mainWindow.webContents.send(messages.REQUEST_MENU_DATA_FOR_WINDOW)
   })

diff --git a/js/stores/eventStore.js b/js/stores/eventStore.js
@@ -63,6 +63,13 @@ const addPageView = (url) => {
   lastActivePageUrl = url
 }
 
+const windowBlurred = (windowId) => {
+  let windowCount = BrowserWindow.getAllWindows().filter((win) => win.isFocused()).length
+  if (windowCount === 0) {
+    addPageView(null)
+  }
+}
+
 const windowClosed = (windowId) => {
   let windowCount = BrowserWindow.getAllWindows().length
   let win = BrowserWindow.getFocusedWindow()
@@ -101,6 +108,16 @@ const doAction = (action) => {
       addPageView(action.frameProps.get('location'))
       lastActiveTabId = action.frameProps.get('tabId')
       break
+    case AppConstants.APP_WINDOW_BLURRED:
+      windowBlurred(action.appWindowId)
+      break
+    case AppConstants.APP_IDLE_STATE_CHANGED:
+      if (action.idleState !== 'active') {
+        addPageView(null)
+      } else {
+        addPageView(lastActivePageUrl)
+      }
+      break
     case AppConstants.APP_CLOSE_WINDOW:
       AppDispatcher.waitFor([AppStore.dispatchToken], () => {
         windowClosed(action.appWindowId)