diff --git a/4chan_x.user.js b/4chan_x.user.js index 278d61eb9..5a23ac813 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -71,7 +71,7 @@ */ (function() { - var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, message, nav, options, qr, quoteBacklink, quoteDR, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher, + var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, SECOND, Time, VERSION, anonymize, conf, config, d, engine, expandComment, expandThread, filter, flatten, g, getTitle, imgExpand, imgGif, imgHover, key, keybinds, log, message, nav, options, qr, quoteBacklink, quoteDR, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, strikethroughQuotes, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher, _base, __slice = Array.prototype.slice; config = { @@ -183,13 +183,7 @@ } }; - try { - log = console.log.bind(console); - } catch (error) { - if (location.hostname === 'boards.4chan.org' && confirm('You appear to be using Greasemonkey.\nYou need to use the superior and stable alternative Scriptish for 4chan X to function correctly.')) { - GM_openInTab('https://addons.mozilla.org/firefox/addon/scriptish/'); - } - } + log = typeof (_base = console.log).bind === "function" ? _base.bind(console) : void 0; conf = {}; @@ -3467,7 +3461,7 @@ if (host !== 'boards.4chan.org') { message.send({ req: 'iframeLoad', - id: host.split('.')[0] + id: location.hostname.split('.')[0] }); } return $.rm(script); diff --git a/script.coffee b/script.coffee index e4266cd46..92def3bda 100644 --- a/script.coffee +++ b/script.coffee @@ -110,11 +110,7 @@ config = # XXX Chrome can't into {log} = console # XXX GreaseMonkey can't into console.log.bind -try - log = console.log.bind console -catch error - if location.hostname is 'boards.4chan.org' and confirm 'You appear to be using Greasemonkey.\nYou need to use the superior and stable alternative Scriptish for 4chan X to function correctly.' - GM_openInTab 'https://addons.mozilla.org/firefox/addon/scriptish/' +log = console.log.bind? console # flatten the config conf = {} @@ -2702,7 +2698,7 @@ message = if host is 'sys.4chan.org' message.send req: 'status', ready: true if host isnt 'boards.4chan.org' - message.send req: 'iframeLoad', id: host.split('.')[0] + message.send req: 'iframeLoad', id: location.hostname.split('.')[0] $.rm script loadControl: ->