Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-22 15:15:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(frame): fix link clicking in iframes

Browse source
This commit is contained in:
Evan Morikawa 2016-04-25 17:28:07 -07:00
parent 11ed4781a4
commit e42f501780
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/components/evented-iframe-spec.cjsx
View file

@ -40,7 +40,9 @@ describe 'EventedIFrame', ->
expect(@setAttributeSpy).not.toHaveBeenCalled()
expect(@openLinkSpy).toHaveBeenCalled()
target = @openLinkSpy.calls[i].args[0].target
expect(target.getAttribute('href')).toBe href
targetHref = @openLinkSpy.calls[i].args[0].href
expect(target).not.toBeDefined()
expect(targetHref).toBe href
it 'corrects relative uris', ->
hrefs = [

12
src/components/evented-iframe.cjsx
View file

@ -150,8 +150,18 @@ class EventedIFrame extends React.Component
else
target.setAttribute('href', "http://#{rawHref}")
rawHref = target.getAttribute('href')
e.preventDefault()
NylasEnv.windowEventHandler.openLink(target: target, metaKey: e.metaKey)
# It's important to send the raw `href` here instead of the target.
# The `target` comes from the document context of the iframe, which
# as of Electron 0.36.9, has different constructor function objects
# in memory than the main execution context. This means that code
# like `e.target instanceof Element` will erroneously return false
# since the `e.target.constructor` and the `Element` function are
# created in different contexts.
NylasEnv.windowEventHandler.openLink(href: rawHref, metaKey: e.metaKey)
_isBlacklistedHref: (href) ->
return (new RegExp(/^file:/i)).test(href)