diff options
| author | Stephen Blott | 2017-11-25 07:29:09 +0000 |
|---|---|---|
| committer | GitHub | 2017-11-25 07:29:09 +0000 |
| commit | 58f45ac17938e2984b3d3b83c8aed452f1287498 (patch) | |
| tree | 505bbdf7678a6b0019785874b7e14f3f56515048 /pages | |
| parent | def334e3647136c23c8825d0f04a5f04eba3d9bc (diff) | |
| parent | c8a395481eeb950c8725e3d6e0fa58510cb407aa (diff) | |
| download | vimium-58f45ac17938e2984b3d3b83c8aed452f1287498.tar.bz2 | |
Merge pull request #2601 from mrmr1993/ff-copy-paste
Enable Firefox clipboard commands
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/help_dialog.coffee | 2 | ||||
| -rw-r--r-- | pages/hud.coffee | 14 | ||||
| -rw-r--r-- | pages/hud.html | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/pages/help_dialog.coffee b/pages/help_dialog.coffee index f36155e4..08180a72 100644 --- a/pages/help_dialog.coffee +++ b/pages/help_dialog.coffee @@ -83,7 +83,7 @@ HelpDialog = commandNameElement.textContent = command.command commandNameElement.title = "Click to copy \"#{command.command}\" to clipboard." commandNameElement.addEventListener "click", -> - chrome.runtime.sendMessage handler: "copyToClipboard", data: commandNameElement.textContent + HUD.copyToClipboard commandNameElement.textContent HUD.showForDuration("Yanked #{commandNameElement.textContent}.", 2000) @showAdvancedCommands(@getShowAdvancedCommands()) diff --git a/pages/hud.coffee b/pages/hud.coffee index 0d2ec2f7..99aaa2ac 100644 --- a/pages/hud.coffee +++ b/pages/hud.coffee @@ -95,5 +95,19 @@ handlers = " (No matches)" countElement.textContent = if showMatchText then countText else "" + copyToClipboard: (data) -> + focusedElement = document.activeElement + Clipboard.copy data + focusedElement?.focus() + window.parent.focus() + UIComponentServer.postMessage {name: "unfocusIfFocused", data} + + pasteFromClipboard: -> + focusedElement = document.activeElement + data = Clipboard.paste() + focusedElement?.focus() + window.parent.focus() + UIComponentServer.postMessage {name: "pasteResponse", data} + UIComponentServer.registerHandler ({data}) -> handlers[data.name ? data]? data FindModeHistory.init() diff --git a/pages/hud.html b/pages/hud.html index 3e8cf976..7bd27171 100644 --- a/pages/hud.html +++ b/pages/hud.html @@ -7,6 +7,7 @@ <script type="text/javascript" src="../lib/settings.js"></script> <script type="text/javascript" src="../lib/keyboard_utils.js"></script> <script type="text/javascript" src="../lib/find_mode_history.js"></script> + <script type="text/javascript" src="../lib/clipboard.js"></script> <script type="text/javascript" src="ui_component_server.js"></script> <script type="text/javascript" src="hud.js"></script> </head> |