From 62076648c3f79722a067b64397d026871f269864 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sun, 26 Aug 2012 22:28:09 +0200 Subject: [PATCH] Fix $.unsafeWindow. --- 4chan_x.user.js | 2 +- script.coffee | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index ef749b5aa..1f1a58cf2 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -512,7 +512,7 @@ $.add(d.head, script); return $.rm(script); }, - unsafeWindow: window.opera && window || unsafeWindow || (function() { + unsafeWindow: window.opera ? window : unsafeWindow !== window ? unsafeWindow : (function() { var p; p = d.createElement('p'); p.setAttribute('onclick', 'return window'); diff --git a/script.coffee b/script.coffee index 7a00843ad..952ae8833 100644 --- a/script.coffee +++ b/script.coffee @@ -392,11 +392,17 @@ $.extend $, $.add d.head, script $.rm script # http://mths.be/unsafewindow - unsafeWindow: window.opera and window or unsafeWindow or (-> - p = d.createElement 'p' - p.setAttribute 'onclick', 'return window' - p.onclick() - )() + unsafeWindow: + if window.opera # Opera + window + else if unsafeWindow isnt window # Firefox + unsafeWindow + else # Chrome + (-> + p = d.createElement 'p' + p.setAttribute 'onclick', 'return window' + p.onclick() + )() shortenFilename: (filename, isOP) -> # FILENAME SHORTENING SCIENCE: # OPs have a +10 characters threshold.