diff options
| author | mrmr1993 | 2015-06-03 00:52:28 +0100 |
|---|---|---|
| committer | mrmr1993 | 2015-06-10 17:26:52 +0100 |
| commit | 7d75b770f65b9ed0c95f694ac2dd59e185fd6a4f (patch) | |
| tree | 28505c1aec926eee027410e9677a2d020987bef4 | |
| parent | 915700fdf846fb1e5cc1ce71e51600257051e1a3 (diff) | |
| download | vimium-7d75b770f65b9ed0c95f694ac2dd59e185fd6a4f.tar.bz2 | |
Move finding the element at a selection's focus to a library function
| -rw-r--r-- | content_scripts/hud.coffee | 11 | ||||
| -rw-r--r-- | lib/dom_utils.coffee | 12 |
2 files changed, 13 insertions, 10 deletions
diff --git a/content_scripts/hud.coffee b/content_scripts/hud.coffee index 9eeb4579..ca2eb7f2 100644 --- a/content_scripts/hud.coffee +++ b/content_scripts/hud.coffee @@ -63,16 +63,7 @@ HUD = # this window. window.focus() - sel = window.getSelection() - focusNode = if not sel.focusNode? - null - else if sel.focusNode == sel.anchorNode and sel.focusOffset == sel.anchorOffset - # The selection either *is* an element, or is inside an opaque element (eg. <input>). - sel.focusNode.childNodes[sel.focusOffset] - else if sel.focusNode.nodeType != sel.focusNode.ELEMENT_NODE - sel.focusNode.parentElement - else - sel.focusNode + focusNode = DomUtils.getSelectionFocusElement() document.activeElement?.blur() focusNode?.focus() diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee index 7c47179c..9658df2b 100644 --- a/lib/dom_utils.coffee +++ b/lib/dom_utils.coffee @@ -326,6 +326,18 @@ DomUtils = document.body.removeChild div coordinates + getSelectionFocusElement: -> + sel = window.getSelection() + if not sel.focusNode? + null + else if sel.focusNode == sel.anchorNode and sel.focusOffset == sel.anchorOffset + # The selection either *is* an element, or is inside an opaque element (eg. <input>). + sel.focusNode.childNodes[sel.focusOffset] + else if sel.focusNode.nodeType != sel.focusNode.ELEMENT_NODE + sel.focusNode.parentElement + else + sel.focusNode + # Get the text content of an element (and its descendents), but omit the text content of previously-visited # nodes. See #1514. # NOTE(smblott). This is currently O(N^2) (when called on N elements). An alternative would be to mark |