Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Remove old copy hack for macOS packaged builds
Browse files Browse the repository at this point in the history
Recently we've been having an intermittent copy problem on macOS again that we haven't seen for a year.

To attempt to fix this we're going to revert an old hack that @diracdeltas did which held us until now

Fix #8876
  • Loading branch information
bbondy committed May 15, 2017
1 parent 8bd7aa6 commit 26afbd5
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
9 changes: 0 additions & 9 deletions app/localShortcuts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion js/constants/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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
Expand Down
2 changes: 1 addition & 1 deletion js/stores/windowStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,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) => {
Expand Down

2 comments on commit 26afbd5

@diracdeltas
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw the original commit was 6485cc5

the 'copy' event handler in js/components/frame.js is also no longer needed

@bsclifton
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Please sign in to comment.