From e9a68b85b20c205a6f817e02bd90a953201d1791 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sun, 18 Sep 2011 03:31:57 +0200 Subject: [PATCH] Remove updater from the master branch --- 4chan_x.user.js | 15 ++------------- latest.js | 1 - script.coffee | 8 -------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 latest.js diff --git a/4chan_x.user.js b/4chan_x.user.js index cedf0e04b..0c8bd5a0d 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -60,7 +60,7 @@ */ (function() { - var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, Recaptcha, SECOND, Time, VERSION, anonymize, conf, config, cooldown, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, qr, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher; + var $, $$, DAY, Favicon, HOUR, MINUTE, Main, NAMESPACE, Recaptcha, SECOND, Time, anonymize, conf, config, cooldown, d, expandComment, expandThread, firstRun, g, getTitle, imgExpand, imgGif, imgHover, imgPreloading, key, keybinds, log, nav, nodeInserted, options, qr, quoteBacklink, quoteInline, quoteOP, quotePreview, redirect, replyHiding, reportButton, revealSpoilers, sauce, threadHiding, threadStats, threading, titlePost, ui, unread, updater, val, watcher; var __slice = Array.prototype.slice; config = { main: { @@ -73,8 +73,7 @@ 'Comment Expansion': [true, 'Expand too long comments'], 'Thread Expansion': [true, 'View all replies'], 'Index Navigation': [true, 'Navigate to previous / next thread'], - 'Reply Navigation': [false, 'Navigate to top / bottom of thread'], - 'Check for Updates': [true, 'Check for updated versions of 4chan x (disabled on master)'] + 'Reply Navigation': [false, 'Navigate to top / bottom of thread'] }, Hiding: { 'Reply Hiding': [true, 'Hide single replies'], @@ -188,7 +187,6 @@ } })(null, config); NAMESPACE = 'AEOS.4chan_x.'; - VERSION = 'master'; SECOND = 1000; MINUTE = 60 * SECOND; HOUR = 60 * MINUTE; @@ -2847,11 +2845,6 @@ now = Date.now(); if (lastChecked < now - 1 * DAY) { $.set('lastChecked', now); - if (conf['Check for Updates'] && VERSION !== 'master') { - $.add(d.head, $.el('script', { - src: 'https://raw.github.com/aeosynth/4chan-x/stable/latest.js' - })); - } cutoff = now - 7 * DAY; hiddenThreads = $.get("hiddenThreads/" + g.BOARD + "/", {}); for (id in hiddenThreads) { @@ -3007,10 +3000,6 @@ origin = e.origin, data = e.data; if (origin === 'http://sys.4chan.org') { return qr.message(data); - } else { - if (data !== VERSION && confirm('a newer version of 4chan x is available, would you like to install it now?')) { - return window.location = 'https://github.com/aeosynth/4chan-x/raw/stable/4chan_x.user.js'; - } } }, css: '\ diff --git a/latest.js b/latest.js deleted file mode 100644 index 41c3a21f3..000000000 --- a/latest.js +++ /dev/null @@ -1 +0,0 @@ -window.postMessage('master', '*'); diff --git a/script.coffee b/script.coffee index 5329ed9f2..e8ef9168c 100644 --- a/script.coffee +++ b/script.coffee @@ -10,7 +10,6 @@ config = 'Thread Expansion': [true, 'View all replies'] 'Index Navigation': [true, 'Navigate to previous / next thread'] 'Reply Navigation': [false, 'Navigate to top / bottom of thread'] - 'Check for Updates': [true, 'Check for updated versions of 4chan x (disabled on master)'] Hiding: 'Reply Hiding': [true, 'Hide single replies'] 'Thread Hiding': [true, 'Hide entire threads'] @@ -112,7 +111,6 @@ conf = {} ) null, config NAMESPACE = 'AEOS.4chan_x.' -VERSION = 'master' SECOND = 1000 MINUTE = 60*SECOND HOUR = 60*MINUTE @@ -2216,9 +2214,6 @@ Main = if lastChecked < now - 1*DAY $.set 'lastChecked', now - if conf['Check for Updates'] and VERSION isnt 'master' - $.add d.head, $.el 'script', src: 'https://raw.github.com/aeosynth/4chan-x/stable/latest.js' - cutoff = now - 7*DAY hiddenThreads = $.get "hiddenThreads/#{g.BOARD}/", {} @@ -2357,9 +2352,6 @@ Main = {origin, data} = e if origin is 'http://sys.4chan.org' qr.message data - else - if data isnt VERSION and confirm 'a newer version of 4chan x is available, would you like to install it now?' - window.location = 'https://github.com/aeosynth/4chan-x/raw/stable/4chan_x.user.js' css: ' /* dialog styling */