Restore Bravery menu to point to new bravery panels

fix #2669 auditors: @bbondy
brave · Jul 23, 2016 · 37f4f20 · bbondy · Jul 23, 2016 · diracdeltas
1 parent e4d8209
commit 37f4f20
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 0 deletions.
diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
@@ -80,6 +80,8 @@ reportAnIssue=Report an Issue
 submitFeedback=Submit Feedback...
 bookmarksToolbar=Bookmarks Toolbar
 bravery=Bravery
+braverySite=Bravery site settings...
+braveryGlobal=Bravery global settings...
 addBookmark=Add Bookmark...
 addFolder=Add Folder...
 unmuteTabs=Unmute Tabs

diff --git a/app/locale.js b/app/locale.js
@@ -142,6 +142,8 @@ var rendererIdentifiers = function () {
     'submitFeedback',
     'bookmarksToolbar',
     'bravery',
+    'braverySite',
+    'braveryGlobal',
     'blockPopups',
     'learnSpelling',
     'ignoreSpelling',

diff --git a/app/menu.js b/app/menu.js
@@ -431,6 +431,12 @@ const init = (settingsState, args) => {
         CommonMenu.separatorMenuItem,
         CommonMenu.importBookmarksMenuItem()
       ]
+    }, {
+      label: locale.translation('bravery'),
+      submenu: [
+        CommonMenu.braveryGlobalMenuItem(),
+        CommonMenu.braverySiteMenuItem()
+      ]
     }, {
       label: locale.translation('window'),
       role: 'window',

diff --git a/js/commonMenu.js b/js/commonMenu.js
@@ -305,3 +305,27 @@ module.exports.aboutBraveMenuItem = () => {
     }
   }
 }
+
+module.exports.braverySiteMenuItem = () => {
+  return {
+    label: locale.translation('braverySite'),
+    click: (item, focusedWindow) => {
+      module.exports.sendToFocusedWindow(focusedWindow, [messages.OPEN_BRAVERY_PANEL])
+    }
+  }
+}
+
+module.exports.braveryGlobalMenuItem = () => {
+  return {
+    label: locale.translation('braveryGlobal'),
+    click: (item, focusedWindow) => {
+      if (BrowserWindow.getAllWindows().length === 0) {
+        appActions.newWindow(Immutable.fromJS({
+          location: 'about:preferences#shields'
+        }))
+      } else {
+        module.exports.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_NEW_FRAME, 'about:preferences#shields', { singleFrame: true }])
+      }
+    }
+  }
+}
diff --git a/js/components/main.js b/js/components/main.js
@@ -130,6 +130,16 @@ class Main extends ImmutableComponent {
         }
       }
     })
+    ipc.on(messages.OPEN_BRAVERY_PANEL, (e) => {
+      if (!this.braveShieldsDisabled) {
+        this.onBraveMenu()
+      } else {
+        windowActions.newFrame({
+          location: 'about:preferences#shields',
+          singleFrame: true
+        }, true)
+      }
+    })
     ipc.on(messages.CAN_SWIPE_BACK, (e) => {
       canSwipeBack = true
     })

diff --git a/js/constants/messages.js b/js/constants/messages.js
@@ -42,6 +42,7 @@ const messages = {
   SHORTCUT_PREV_TAB: _,
   // Misc application events
   QUIT_APPLICATION: _,
+  OPEN_BRAVERY_PANEL: _,
   PREFS_RESTART: _,
   UPDATE_APP_MENU: _, /** @arg {Object} args menu args to update */
   CERT_ERROR: _, /** @arg {Object} details of certificate error */

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -567,6 +567,12 @@ function hamburgerTemplateInit (location, e) {
         CommonMenu.separatorMenuItem,
         CommonMenu.importBookmarksMenuItem()
       ]
+    }, {
+      label: locale.translation('bravery'),
+      submenu: [
+        CommonMenu.braveryGlobalMenuItem(),
+        CommonMenu.braverySiteMenuItem()
+      ]
     },
     CommonMenu.downloadsMenuItem(),
     CommonMenu.separatorMenuItem,