diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 2e1e2bdf5..fd2050876 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -346,7 +346,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 }, 'Custom CSS': false, Index: { @@ -11320,15 +11320,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 f51e1ac76..39e5bbb34 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -325,7 +325,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 }, 'Custom CSS': false, Index: { @@ -11306,15 +11306,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/General/Config.coffee b/src/General/Config.coffee index e164a25c7..e86122001 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -823,7 +823,7 @@ http://iqdb.org/?url=%TURL FappeT: fappe: false - werk: true + werk: false 'Custom CSS': false diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee index 1df80f5cd..8854457de 100755 --- a/src/Monitoring/ThreadUpdater.coffee +++ b/src/Monitoring/ThreadUpdater.coffee @@ -149,18 +149,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: ->