Merge pull request #10419 from brave/10214

Revert "Revert "Remove old copy hack for macOS packaged builds""
brave · Aug 11, 2017 · 4d010b5 · 4d010b5
1 parent abfa9c2
commit 4d010b5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/app/localShortcuts.js b/app/localShortcuts.js
@@ -45,15 +45,6 @@ module.exports.register = (win) => {
     simpleWebContentEvents.push(
       ['Cmd+Alt+U', messages.SHORTCUT_ACTIVE_FRAME_VIEW_SOURCE]
     )
-
-    if (process.env.NODE_ENV !== 'development') {
-      // We're in Darwin and release or test mode...
-      // We disable for development mode because Browser level dev tools copy doesn't work.
-      // Workaround for #1060
-      simpleWebContentEvents.push(
-        ['Cmd+C', messages.SHORTCUT_ACTIVE_FRAME_COPY]
-      )
-    }
   }
 
   // Tab ordering shortcuts

diff --git a/js/constants/messages.js b/js/constants/messages.js
@@ -31,7 +31,6 @@ const messages = {
   SHORTCUT_ACTIVE_FRAME_FORWARD: _,
   SHORTCUT_ACTIVE_FRAME_BOOKMARK: _,
   SHORTCUT_ACTIVE_FRAME_REMOVE_BOOKMARK: _,
-  SHORTCUT_ACTIVE_FRAME_COPY: _,
   SHORTCUT_ACTIVE_FRAME_FIND_NEXT: _,
   SHORTCUT_ACTIVE_FRAME_FIND_PREV: _,
   // Frame management shortcuts

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -852,7 +852,7 @@ ipc.on(messages.SHORTCUT_OPEN_CLEAR_BROWSING_DATA_PANEL, (e) => {
   })
 })
 
-const frameShortcuts = ['stop', 'reload', 'zoom-in', 'zoom-out', 'zoom-reset', 'toggle-dev-tools', 'clean-reload', 'view-source', 'mute', 'save', 'print', 'show-findbar', 'copy', 'find-next', 'find-prev']
+const frameShortcuts = ['stop', 'reload', 'zoom-in', 'zoom-out', 'zoom-reset', 'toggle-dev-tools', 'clean-reload', 'view-source', 'mute', 'save', 'print', 'show-findbar', 'find-next', 'find-prev']
 frameShortcuts.forEach((shortcut) => {
   // Listen for actions on the active frame
   ipc.on(`shortcut-active-frame-${shortcut}`, (e, args) => {