This repository has been archived by the owner on Aug 27, 2019. It is now read-only.
Add Edit commands #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,17 @@ var amLoaded = amLoaded || false; | |
| if (!amLoaded) { | ||
| amLoaded = true; | ||
| browser.runtime.onMessage.addListener(async (message, sender) => { | ||
| let focusedElement = document.activeElement; | ||
| let isFocusable = focusedElement && focusedElement !== document.body; | ||
| let method = String(message.method); | ||
| let execCommand = (command) => { | ||
| window.focus(); | ||
| if (isFocusable) { | ||
| focusedElement.focus(); | ||
| } | ||
| document.execCommand(command); | ||
| }; | ||
|
|
||
| switch (method) { | ||
| case "init": { | ||
| let result = { | ||
|
|
@@ -31,27 +41,41 @@ if (!amLoaded) { | |
| "saveAs" | ||
| ] | ||
| } | ||
|
|
||
| if (isFocusable && focusedElement.isContentEditable) { | ||
| result.enable.push("edit*"); | ||
| } else if (isFocusable) { | ||
| result.enable.push("editCut", "editCopy", "editSelectAll"); | ||
| } else { | ||
| result.enable.push("editCopy", "editSelectAll"); | ||
|
There was a problem hiding this comment. Copy is still broken in this context on Windows. That’s why I implemented commit Do note that I only tested this on Stable and Developer Edition, but not on Nightly. There was a problem hiding this comment. I use Nightly, which may have a different behaviour. There was a problem hiding this comment. Hmm, actually, it doesn't work for me either in this context. There was a problem hiding this comment. Actually it does work, it seems like your latest commit breaks this though. |
||
| } | ||
| return result; | ||
| } case "editCut": { | ||
| return execCommand("cut"); | ||
| } case "editCopy": { | ||
| return execCommand("copy"); | ||
| } case "editPaste": { | ||
| return execCommand("paste"); | ||
| } case "editUndo": { | ||
| return execCommand("undo"); | ||
| } case "editRedo": { | ||
| return execCommand("redo"); | ||
| } case "editSelectAll": { | ||
| // Select all doesn't work reliably on inputs yet | ||
|
There was a problem hiding this comment. Note to self: This comment needs to updated, select all works properly on inputs. |
||
| if (isFocusable) { | ||
| window.focus(); | ||
| focusedElement.focus(); | ||
| return focusedElement.select(); | ||
| } | ||
|
|
||
| // ...so we select everything on the page | ||
| let selection = window.getSelection(); | ||
| let range = document.createRange(); | ||
| range.selectNodeContents(document.documentElement); | ||
| selection.removeAllRanges(); | ||
| return selection.addRange(range); | ||
| } case "editDelete": { | ||
| return execCommand("delete"); | ||
| } case "print": { | ||
| return window.print(); | ||
| } default: { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should stay here, because it ensures that the edit menu isn’t enabled when the content script can’t start (i.e. the page is privileged (
about:,chrome://orresource://)).Yes, I do realize that this is contained in the
*selector above, but that one will be removed once the menu is fully implemented, while theedit*selector and any other selector dependant on the content script will be kept.