From 7958371a24f145d7edaccfe1044281eb99b110ea Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Mon, 16 Dec 2013 18:29:45 -0700 Subject: [PATCH 1/2] I have no idea how I enabled that by default. I == dumb --- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/General/Config.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index a27b879dd..8fdcc0ace 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -254,7 +254,7 @@ sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", FappeT: { fappe: false, - werk: true + werk: false }, 'sageEmoji': '4chan SS', 'emojiPos': 'before', diff --git a/builds/crx/script.js b/builds/crx/script.js index ec9cb9d22..ce225ef1f 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -232,7 +232,7 @@ sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", FappeT: { fappe: false, - werk: true + werk: false }, 'sageEmoji': '4chan SS', 'emojiPos': 'before', diff --git a/src/General/Config.coffee b/src/General/Config.coffee index a49f7c8cc..8bd2b4df1 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -496,7 +496,7 @@ http://iqdb.org/?url=%TURL FappeT: fappe: false - werk: true + werk: false 'sageEmoji': '4chan SS' From 75b7804eda353dcf3960d9a9b1127fbc6bba72d9 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Mon, 16 Dec 2013 20:07:27 -0700 Subject: [PATCH 2/2] Fix and recomprehense the setInterval function --- builds/4chan-X.user.js | 18 +++++++++------- builds/crx/script.js | 18 +++++++++------- src/Monitoring/ThreadUpdater.coffee | 32 +++++++++++++++++++---------- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 8fdcc0ace..84e2e89a3 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -9010,15 +9010,19 @@ } }, setInterval: function() { - var cur, i, j; + var cur, i, j, limit; - i = ThreadUpdater.interval; - j = (cur = ThreadUpdater.outdateCount < 10) ? cur : 10; - if (!d.hidden) { - j = j < 7 ? j : 7; + i = ThreadUpdater.interval + 1; + if (Conf['Optional Increase']) { + cur = ThreadUpdater.outdateCount || 1; + limit = d.hidden ? 7 : 10; + j = cur <= limit ? cur : limit; + cur = ((i * 0.1).floor() || 1) * j * j; + ThreadUpdater.seconds = cur > i ? cur <= 300 ? cur : 300 : i; + } else { + ThreadUpdater.seconds = i; } - ThreadUpdater.seconds = Conf['Optional Increase'] ? (cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i) ? cur : i : i; - ThreadUpdater.set('timer', ThreadUpdater.seconds++); + ThreadUpdater.set('timer', ThreadUpdater.seconds); return ThreadUpdater.count(true); }, intervalShortcut: function() { diff --git a/builds/crx/script.js b/builds/crx/script.js index ce225ef1f..92bc2dc4a 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -8995,15 +8995,19 @@ } }, setInterval: function() { - var cur, i, j; + var cur, i, j, limit; - i = ThreadUpdater.interval; - j = (cur = ThreadUpdater.outdateCount < 10) ? cur : 10; - if (!d.hidden) { - j = j < 7 ? j : 7; + i = ThreadUpdater.interval + 1; + if (Conf['Optional Increase']) { + cur = ThreadUpdater.outdateCount || 1; + limit = d.hidden ? 7 : 10; + j = cur <= limit ? cur : limit; + cur = ((i * 0.1).floor() || 1) * j * j; + ThreadUpdater.seconds = cur > i ? cur <= 300 ? cur : 300 : i; + } else { + ThreadUpdater.seconds = i; } - ThreadUpdater.seconds = Conf['Optional Increase'] ? (cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i) ? cur : i : i; - ThreadUpdater.set('timer', ThreadUpdater.seconds++); + ThreadUpdater.set('timer', ThreadUpdater.seconds); return ThreadUpdater.count(true); }, intervalShortcut: function() { diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee index 2bb8b9549..ff7e5ab01 100755 --- a/src/Monitoring/ThreadUpdater.coffee +++ b/src/Monitoring/ThreadUpdater.coffee @@ -148,18 +148,28 @@ ThreadUpdater = ThreadUpdater.cb.checkpost() setInterval: -> - i = ThreadUpdater.interval - # Math.min/max is provably slow: http://jsperf.com/math-s-min-max-vs-homemade/5 - j = if cur = ThreadUpdater.outdateCount < 10 then cur else 10 - unless d.hidden + i = ThreadUpdater.interval + 1 + + if Conf['Optional Increase'] # Lower the max refresh rate limit on visible tabs. - j = if j < 7 then j else 7 - ThreadUpdater.seconds = - if Conf['Optional Increase'] - if cur = [0, 5, 10, 15, 20, 30, 60, 90, 120, 240, 300][j] > i then cur else i - else - i - ThreadUpdater.set 'timer', ThreadUpdater.seconds++ + cur = ThreadUpdater.outdateCount or 1 + limit = if d.hidden then 7 else 10 + j = if cur <= limit then cur else limit + + # 1 second to 100, 30 to 300. + cur = ((i * 0.1).floor() or 1) * j * j + ThreadUpdater.seconds = + if cur > i + if cur <= 300 + cur + else + 300 + else + i + else + ThreadUpdater.seconds = i + + ThreadUpdater.set 'timer', ThreadUpdater.seconds ThreadUpdater.count true intervalShortcut: ->