Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accessing window.frameElement.src from non-same-origin window may cause an error.

Browse Source 
Fixes regression from 59bac43afb725c0960d6a40c6847489f3c09a43c.
This commit is contained in:
ccd0 2016-06-05 00:38:59 -07:00
parent de0dbbf5da
commit e44df3d08b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/Main.coffee
View File

@ -3,9 +3,6 @@ Main =
# XXX Work around Pale Moon / old Firefox + GM 1.15 bug where script runs in iframe with wrong window.location. # XXX Work around Pale Moon / old Firefox + GM 1.15 bug where script runs in iframe with wrong window.location.
return if d.body and not $ 'title', d.head return if d.body and not $ 'title', d.head
# Don't run inside ad iframes.
return if window.frameElement and window.frameElement.src is ''
# XXX dwb userscripts extension reloads scripts run at document-start when replaceState/pushState is called. # XXX dwb userscripts extension reloads scripts run at document-start when replaceState/pushState is called.
return if window['<%= meta.name %> antidup'] return if window['<%= meta.name %> antidup']
window['<%= meta.name %> antidup'] = true window['<%= meta.name %> antidup'] = true
@ -16,6 +13,9 @@ Main =
$.ready -> Captcha.fixes.init() $.ready -> Captcha.fixes.init()
return return
# Don't run inside ad iframes.
return if window.frameElement and window.frameElement.src is ''
# Detect multiple copies of 4chan X # Detect multiple copies of 4chan X
$.on d, '4chanXInitFinished', -> $.on d, '4chanXInitFinished', ->
if Main.expectInitFinished if Main.expectInitFinished