From b204c03f7eb3bcc36213eb68b920829a018001e1 Mon Sep 17 00:00:00 2001 From: girst Date: Sun, 1 Dec 2019 18:57:09 +0100 Subject: [PATCH] Remove misuse of isXULDocument() A new isXULElement() has been introduced as a replacement for improper use of isXULDocument() (where the latter was used to indirectly check the former). isXULDocument() only works if the xul-xmlns is attached to the document as its main namespace, which is not the case e.g. on fx72's about:preferences#sync (the test for which now uses isXULElement). The test in isProperLink() actually wants to know if an element belongs to the XUL namespace, not if it is embedded in a document of that NS (to treat element equivalent to ). The blurring condition in events-frame.coffee was introduced in e881629 for about:config, but that does not work any more and is also annoying on :prefs (and was again an indirect test for what was actually wanted). In commands-frame.coffee's commands.follow(), two of the three uses of isXULDocument have been replaced by the proper isXULElement, the third one is likely to be correct (as there isn't a on xul-s). This leaves us with 1 remaining unclean use, in commands-frame.coffee's helper_follow(). It is used to catch all the xul elements that have html equivalents with different tag names. Replacing that with something proper will not be attempted in this change, as it would probably require changing its callers to pass in different arguments when ran in the XUL namespace. --- extension/lib/commands-frame.coffee | 14 +++++++------- extension/lib/events-frame.coffee | 6 ++---- extension/lib/utils.coffee | 11 ++++++++--- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/extension/lib/commands-frame.coffee b/extension/lib/commands-frame.coffee index ab943b0..9746788 100644 --- a/extension/lib/commands-frame.coffee +++ b/extension/lib/commands-frame.coffee @@ -240,7 +240,6 @@ commands.follow = helper_follow.bind( null, {id: 'normal'}, ({vim, element, getElementShape}) -> document = element.ownerDocument - isXUL = utils.isXULDocument(document) type = null switch # Bootstrap. Match these before regular links, because especially slider @@ -292,14 +291,16 @@ commands.follow = helper_follow.bind( # its `` gets one. However, some sites hide the actual `` # but keeps the `` to click, either for styling purposes or to keep # the `` hidden until it is used. In those cases we should add a - # marker for the ``. Trying to access `.control` on an element in - # `about:config` throws an error, so exclude XUL pages. - when not isXUL and element.localName == 'label' and element.control and + # marker for the ``. Trying to access `.control` on the XUL + # element returns a string instead of an HTMLElement, so we don't do that. + when not utils.isXULElement(element) and + element.localName == 'label' and + element.control and not getElementShape(element.control).nonCoveredPoint type = 'clickable' # Last resort checks for elements that might be clickable because of # JavaScript. - when (not isXUL and + when (not utils.isXULDocument(document) and # It is common to listen for clicks on `` or ``. Donât # waste time on them. element not in [document.documentElement, document.body]) and @@ -403,9 +404,8 @@ commands.click_marker_element = ( type in ['clickable', 'link'] and utils.isInShadowRoot(element) element.click() else - isXUL = utils.isXULDocument(element.ownerDocument) sequence = switch - when isXUL + when utils.isXULElement(element) if element.localName == 'tab' then ['mousedown'] else 'click-xul' when type == 'context' 'context' diff --git a/extension/lib/events-frame.coffee b/extension/lib/events-frame.coffee index d244120..e238613 100644 --- a/extension/lib/events-frame.coffee +++ b/extension/lib/events-frame.coffee @@ -242,10 +242,8 @@ class FrameEventManager not @vim.state.hasInteraction and # â¦and the event is programmatic (not caused by clicks or keypresses)â¦ nsIFocusManager.getLastFocusMethod(null) == 0 and - # â¦and the target may steal most keystrokesâ¦ - utils.isTypingElement(target) and - # â¦and the page isnât a Firefox internal page (like `about:config`). - not utils.isXULDocument(@vim.content.document) + # â¦and the target may steal most keystrokes + utils.isTypingElement(target) # Some sites (such as icloud.com) re-focuses inputs if they are blurred, # causing an infinite loop of autofocus prevention and re-focusing. # Therefore, blur events that happen just after an autofocus prevention diff --git a/extension/lib/utils.coffee b/extension/lib/utils.coffee index 03951b9..6e414d3 100644 --- a/extension/lib/utils.coffee +++ b/extension/lib/utils.coffee @@ -37,9 +37,11 @@ getDocument = (e) -> if e.parentNode? then arguments.callee(e.parentNode) else e isInShadowRoot = (element) -> ShadowRoot? and getDocument(element) instanceof ShadowRoot +XUL_NS = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' isXULDocument = (doc) -> - XUL_NS = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' doc.documentElement.namespaceURI == XUL_NS +isXULElement = (element) -> + element.namespaceURI == XUL_NS # Full chains of events for different mouse actions. Note: 'click' is fired # by Firefox automatically after 'mousedown' and 'mouseup'. Similarly, @@ -156,7 +158,9 @@ isProperLink = (element) -> # href="">`s used as buttons on some sites. return element.getAttribute?('href') and (element.localName == 'a' or - isXULDocument(element.ownerDocument)) and + (isXULElement(element) and + element.localName == 'label' and + element.getAttribute('is') == 'text-link')) and not element.href?.endsWith?('#') and not element.href?.endsWith?('#?') and not element.href?.startsWith?('javascript:') @@ -723,7 +727,7 @@ observe = (topic, observer) -> # Try to open a buttonâs dropdown menu, if any. openDropdown = (element) -> - if isXULDocument(element.ownerDocument) and + if isXULElement(element) and element.getAttribute?('type') == 'menu' and element.open == false # Only change `.open` if it is already a boolean. element.open = true @@ -756,6 +760,7 @@ module.exports = { isTextInputElement isTypingElement isXULDocument + isXULElement isInShadowRoot blurActiveBrowserElement -- 2.39.3