diff options
| author | mrmr1993 | 2015-04-28 23:11:20 +0100 | 
|---|---|---|
| committer | mrmr1993 | 2015-04-28 23:15:40 +0100 | 
| commit | 18f8c31269a5e0ce2e896c157a703f6b73c0aa90 (patch) | |
| tree | cb4104e50e29380437edb3b79aaf4902e6ac51c9 | |
| parent | a471867fad98a4363c5df5f5ae1becbc289d1dbd (diff) | |
| download | vimium-18f8c31269a5e0ce2e896c157a703f6b73c0aa90.tar.bz2 | |
Recognise inline child elements of height=0 elements caused by font-size
If an element with style="display: inline; font-size: 0px;" surrounds
another element with style="display: inline; font-size: apx;", where a
is non-zero, then the inner element and its contents will be visible.
However, the outer element will register height=0 in its clientRects,
which previously caused us to reject these elements. This changes the
behaviour to handle this case correctly.
| -rw-r--r-- | lib/dom_utils.coffee | 20 | 
1 files changed, 16 insertions, 4 deletions
| diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee index 30b9f68c..7c47179c 100644 --- a/lib/dom_utils.coffee +++ b/lib/dom_utils.coffee @@ -62,17 +62,29 @@ DomUtils =      # Note: this call will be expensive if we modify the DOM in between calls.      clientRects = (Rect.copy clientRect for clientRect in element.getClientRects()) +    # Inline elements with font-size: 0px; will declare a height of zero, even if a child with non-zero +    # font-size contains text. +    isInlineZeroHeight = -> +      elementComputedStyle = window.getComputedStyle element, null +      isInlineZeroFontSize = (0 == elementComputedStyle.getPropertyValue("display").indexOf "inline") and +        (elementComputedStyle.getPropertyValue("font-size") == "0px") +      # Override the function to return this value for the rest of this context. +      isInlineZeroHeight = -> isInlineZeroFontSize +      isInlineZeroFontSize +      for clientRect in clientRects        # If the link has zero dimensions, it may be wrapping visible but floated elements. Check for this.        if (clientRect.width == 0 or clientRect.height == 0) and testChildren          for child in element.children            computedStyle = window.getComputedStyle(child, null) -          # Ignore child elements which are not floated and not absolutely positioned for parent elements with -          # zero width/height +          # Ignore child elements which are not floated and not absolutely positioned for parent elements +          # with zero width/height, as long as the case described at isInlineZeroHeight does not apply.            # NOTE(mrmr1993): This ignores floated/absolutely positioned descendants nested within inline            # children. -          continue if (computedStyle.getPropertyValue('float') == 'none' && -            computedStyle.getPropertyValue('position') != 'absolute') +          continue if (computedStyle.getPropertyValue("float") == "none" and +            computedStyle.getPropertyValue("position") != "absolute" and +            not (clientRect.height == 0 and isInlineZeroHeight() and +              0 == computedStyle.getPropertyValue("display").indexOf "inline"))            childClientRect = @getVisibleClientRect child, true            continue if childClientRect == null or childClientRect.width < 3 or childClientRect.height < 3            return childClientRect | 
