From 2a1f482e66d0c1325fc03fb69ebb1a1eb7f72dd2 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Tue, 17 Jan 2012 23:39:38 -0600 Subject: [PATCH 01/15] Fix scroll offset when contracting images --- 4chan_x.user.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 6f59cf6ff..71db82528 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2960,7 +2960,7 @@ _results2 = []; for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) { thumb = _ref2[_j]; - _results2.push(imgExpand.contract(thumb)); + _results2.push(imgExpand.contract(thumb, false)); } return _results2; } @@ -2994,13 +2994,23 @@ var thumb; thumb = a.firstChild; if (thumb.hidden) { - return imgExpand.contract(thumb); + return imgExpand.contract(thumb, true); } else { return imgExpand.expand(thumb); } }, - contract: function(thumb) { + contract: function(thumb, bScroll) { thumb.hidden = false; + if (bScroll) { + var el, top; + el = thumb.parentNode.parentNode; + top = el.offsetTop; + while (el.offsetParent) { + el = el.offsetParent; + top += el.offsetTop; + } + if (top < window.scrollY) window.scroll(window.scrollX, top); + } return $.rm(thumb.nextSibling); }, expand: function(thumb, url) { @@ -3021,7 +3031,7 @@ error: function() { var req, src, thumb, url; thumb = this.previousSibling; - imgExpand.contract(thumb); + imgExpand.contract(thumb, true); src = this.src.split('/'); if (url = redirect.image(src[3], src[5])) { return imgExpand.expand(thumb, url); From 7a2343f6c53674cdb70f6ce0e443a1b2f946bd6a Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 18 Jan 2012 16:16:01 -0600 Subject: [PATCH 02/15] Changed offset fix for only images that are larger than the viewport --- 4chan_x.user.js | 28 +++++++++++++--------------- script.coffee | 6 ++++++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 71db82528..8a990db59 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2960,7 +2960,7 @@ _results2 = []; for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) { thumb = _ref2[_j]; - _results2.push(imgExpand.contract(thumb, false)); + _results2.push(imgExpand.contract(thumb)); } return _results2; } @@ -2991,26 +2991,24 @@ } }, toggle: function(a) { - var thumb; + var el, thumb, top; thumb = a.firstChild; if (thumb.hidden) { - return imgExpand.contract(thumb, true); + if (thumb.nextSibling.offsetHeight > window.innerHeight) { + el = thumb.nextSibling; + top = el.offsetTop; + while (el = el.offsetParent) { + top += el.offsetTop; + } + if (top < window.scrollY) window.scroll(window.scrollX, top); + } + return imgExpand.contract(thumb); } else { return imgExpand.expand(thumb); } }, - contract: function(thumb, bScroll) { + contract: function(thumb) { thumb.hidden = false; - if (bScroll) { - var el, top; - el = thumb.parentNode.parentNode; - top = el.offsetTop; - while (el.offsetParent) { - el = el.offsetParent; - top += el.offsetTop; - } - if (top < window.scrollY) window.scroll(window.scrollX, top); - } return $.rm(thumb.nextSibling); }, expand: function(thumb, url) { @@ -3031,7 +3029,7 @@ error: function() { var req, src, thumb, url; thumb = this.previousSibling; - imgExpand.contract(thumb, true); + imgExpand.contract(thumb); src = this.src.split('/'); if (url = redirect.image(src[3], src[5])) { return imgExpand.expand(thumb, url); diff --git a/script.coffee b/script.coffee index 0b00eb3bd..7f789239c 100644 --- a/script.coffee +++ b/script.coffee @@ -2316,6 +2316,12 @@ imgExpand = toggle: (a) -> thumb = a.firstChild if thumb.hidden + if thumb.nextSibling.offsetHeight > window.innerHeight + el = thumb.nextSibling + top = el.offsetTop + while el = el.offsetParent + top += el.offsetTop + window.scroll window.scrollX, top if top < window.scrollY imgExpand.contract thumb else imgExpand.expand thumb From 9baddbc771269d3efc152d6aa4035572bd09c5f3 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 18 Jan 2012 19:09:37 -0600 Subject: [PATCH 03/15] Use getBoundingClientRect and body.clientHeight for offset fix --- 4chan_x.user.js | 11 +++-------- script.coffee | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 8a990db59..e49f56285 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2991,16 +2991,11 @@ } }, toggle: function(a) { - var el, thumb, top; + var thumb, top; thumb = a.firstChild; if (thumb.hidden) { - if (thumb.nextSibling.offsetHeight > window.innerHeight) { - el = thumb.nextSibling; - top = el.offsetTop; - while (el = el.offsetParent) { - top += el.offsetTop; - } - if (top < window.scrollY) window.scroll(window.scrollX, top); + if (thumb.nextSibling.offsetHeight > d.body.clientHeight && (top = a.getBoundingClientRect().top) < 0) { + window.scroll(window.scrollX, window.scrollY + top); } return imgExpand.contract(thumb); } else { diff --git a/script.coffee b/script.coffee index 7f789239c..d4c4aabae 100644 --- a/script.coffee +++ b/script.coffee @@ -2316,12 +2316,8 @@ imgExpand = toggle: (a) -> thumb = a.firstChild if thumb.hidden - if thumb.nextSibling.offsetHeight > window.innerHeight - el = thumb.nextSibling - top = el.offsetTop - while el = el.offsetParent - top += el.offsetTop - window.scroll window.scrollX, top if top < window.scrollY + if thumb.nextSibling.offsetHeight > d.body.clientHeight and (top = a.getBoundingClientRect().top) < 0 + window.scroll window.scrollX, window.scrollY + top imgExpand.contract thumb else imgExpand.expand thumb From 3d1de50d152f6604cdb6a80032298804e4003efd Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 18 Jan 2012 21:00:54 -0600 Subject: [PATCH 04/15] Scroll to the same position on the thumbnail as was being viewed before contracting --- script.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script.coffee b/script.coffee index d4c4aabae..b21c55485 100644 --- a/script.coffee +++ b/script.coffee @@ -2316,8 +2316,9 @@ imgExpand = toggle: (a) -> thumb = a.firstChild if thumb.hidden - if thumb.nextSibling.offsetHeight > d.body.clientHeight and (top = a.getBoundingClientRect().top) < 0 - window.scroll window.scrollX, window.scrollY + top + rect = a.getBoundingClientRect() + d.body.scrollTop += if rect.top < 0 then rect.top + thumb.height / (rect.height / rect.top * -1) else 0 + d.body.scrollLeft += if rect.left < 0 then rect.left + thumb.width / (rect.width / rect.left * -1) else 0 imgExpand.contract thumb else imgExpand.expand thumb From 791c3fcd789b7cee1338abe18797efa42d989967 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 18 Jan 2012 21:01:44 -0600 Subject: [PATCH 05/15] Build --- 4chan_x.user.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index e49f56285..053ea029c 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2991,12 +2991,12 @@ } }, toggle: function(a) { - var thumb, top; + var rect, thumb; thumb = a.firstChild; if (thumb.hidden) { - if (thumb.nextSibling.offsetHeight > d.body.clientHeight && (top = a.getBoundingClientRect().top) < 0) { - window.scroll(window.scrollX, window.scrollY + top); - } + rect = a.getBoundingClientRect(); + d.body.scrollTop += rect.top < 0 ? rect.top + thumb.height / (rect.height / rect.top * -1) : 0; + d.body.scrollLeft += rect.left < 0 ? rect.left + thumb.width / (rect.width / rect.left * -1) : 0; return imgExpand.contract(thumb); } else { return imgExpand.expand(thumb); From 8f29d8eac9421bf26fc1ce127b783760ecaeb2a8 Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 18 Jan 2012 22:55:16 -0600 Subject: [PATCH 06/15] Replace ternary operator with simple if --- 4chan_x.user.js | 8 ++++++-- script.coffee | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 053ea029c..fa37d7b68 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2995,8 +2995,12 @@ thumb = a.firstChild; if (thumb.hidden) { rect = a.getBoundingClientRect(); - d.body.scrollTop += rect.top < 0 ? rect.top + thumb.height / (rect.height / rect.top * -1) : 0; - d.body.scrollLeft += rect.left < 0 ? rect.left + thumb.width / (rect.width / rect.left * -1) : 0; + if (rect.top < 0) { + d.body.scrollTop += rect.top + thumb.height / (rect.height / rect.top * -1); + } + if (rect.left < 0) { + d.body.scrollLeft += rect.left + thumb.width / (rect.width / rect.left * -1); + } return imgExpand.contract(thumb); } else { return imgExpand.expand(thumb); diff --git a/script.coffee b/script.coffee index b21c55485..25be94ca4 100644 --- a/script.coffee +++ b/script.coffee @@ -2317,8 +2317,8 @@ imgExpand = thumb = a.firstChild if thumb.hidden rect = a.getBoundingClientRect() - d.body.scrollTop += if rect.top < 0 then rect.top + thumb.height / (rect.height / rect.top * -1) else 0 - d.body.scrollLeft += if rect.left < 0 then rect.left + thumb.width / (rect.width / rect.left * -1) else 0 + d.body.scrollTop += rect.top + thumb.height / (rect.height / rect.top * -1) if rect.top < 0 + d.body.scrollLeft += rect.left + thumb.width / (rect.width / rect.left * -1) if rect.left < 0 imgExpand.contract thumb else imgExpand.expand thumb From efc557cb1dd6fa3d9fad97bf50c316e441d0759e Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Thu, 19 Jan 2012 10:15:07 -0600 Subject: [PATCH 07/15] Scroll to top of thumbnail when contracting expanded image --- 4chan_x.user.js | 8 ++------ script.coffee | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index fa37d7b68..cf7704076 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2995,12 +2995,8 @@ thumb = a.firstChild; if (thumb.hidden) { rect = a.getBoundingClientRect(); - if (rect.top < 0) { - d.body.scrollTop += rect.top + thumb.height / (rect.height / rect.top * -1); - } - if (rect.left < 0) { - d.body.scrollLeft += rect.left + thumb.width / (rect.width / rect.left * -1); - } + if (rect.top < 0) d.body.scrollTop += rect.top; + if (rect.left < 0) d.body.scrollLeft += rect.left; return imgExpand.contract(thumb); } else { return imgExpand.expand(thumb); diff --git a/script.coffee b/script.coffee index 25be94ca4..c5e22e0bf 100644 --- a/script.coffee +++ b/script.coffee @@ -2317,8 +2317,8 @@ imgExpand = thumb = a.firstChild if thumb.hidden rect = a.getBoundingClientRect() - d.body.scrollTop += rect.top + thumb.height / (rect.height / rect.top * -1) if rect.top < 0 - d.body.scrollLeft += rect.left + thumb.width / (rect.width / rect.left * -1) if rect.left < 0 + d.body.scrollTop += rect.top if rect.top < 0 + d.body.scrollLeft += rect.left if rect.left < 0 imgExpand.contract thumb else imgExpand.expand thumb From 0ccacc490fe33044c593d8a97a11f193adbaf9ac Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 19 Jan 2012 20:31:36 +0100 Subject: [PATCH 08/15] Do not try to reload the picture immediately from archivers; if it fails to load from archivers, try to load from 4chan again. --- 4chan_x.user.js | 4 ++-- script.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 6f59cf6ff..bda3e90f8 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3023,8 +3023,8 @@ thumb = this.previousSibling; imgExpand.contract(thumb); src = this.src.split('/'); - if (url = redirect.image(src[3], src[5])) { - return imgExpand.expand(thumb, url); + if (src[2] === 'images.4chan.org' && (url = redirect.image(src[3], src[5]))) { + return setTimeout(imgExpand.expand, 10000, thumb, url); } else if (engine === 'webkit') { return req = $.ajax(this.src, (function() { if (this.status !== 404) { diff --git a/script.coffee b/script.coffee index 0b00eb3bd..1def04236 100644 --- a/script.coffee +++ b/script.coffee @@ -2340,8 +2340,8 @@ imgExpand = thumb = @previousSibling imgExpand.contract thumb src = @src.split '/' - if url = redirect.image src[3], src[5] - imgExpand.expand thumb, url + if src[2] is 'images.4chan.org' and url = redirect.image src[3], src[5] + setTimeout imgExpand.expand, 10000, thumb, url #navigator.online is not x-browser/os yet else if engine is 'webkit' req = $.ajax @src, (-> From 25276b5aac2bc197b3a7dba34f7a4540f62d0da9 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 19 Jan 2012 22:04:27 +0100 Subject: [PATCH 09/15] Fool the browser cache and CloudFlare's cache when trying to reload a picture from 4chan. --- 4chan_x.user.js | 22 ++++++++++++---------- script.coffee | 16 +++++++++------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index bda3e90f8..697732903 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3005,9 +3005,10 @@ }, expand: function(thumb, url) { var a, filesize, img, max; + if (thumb.hidden) return; a = thumb.parentNode; img = $.el('img', { - src: url ? url : a.href + src: url || a.href }); if (engine === 'gecko' && a.parentNode.className !== 'op') { filesize = $.x('preceding-sibling::span[@class="filesize"]', a).textContent; @@ -3019,28 +3020,29 @@ return $.add(a, img); }, error: function() { - var req, src, thumb, url; + var href, req, src, thumb, url; + href = this.parentNode.href; thumb = this.previousSibling; imgExpand.contract(thumb); - src = this.src.split('/'); + src = href.split('/'); if (src[2] === 'images.4chan.org' && (url = redirect.image(src[3], src[5]))) { - return setTimeout(imgExpand.expand, 10000, thumb, url); - } else if (engine === 'webkit') { + setTimeout(imgExpand.expand, 10000, thumb, url); + return; + } + url = href + '?' + Date.now(); + if (engine === 'webkit') { return req = $.ajax(this.src, (function() { if (this.status !== 404) { - return setTimeout(imgExpand.retry, 10000, thumb); + return setTimeout(imgExpand.expand, 10000, thumb, url); } }), { type: 'head', event: 'onreadystatechange' }); } else if (!g.dead) { - return setTimeout(imgExpand.retry, 10000, thumb); + return setTimeout(imgExpand.expand, 10000, thumb, url); } }, - retry: function(thumb) { - if (!thumb.hidden) return imgExpand.expand(thumb); - }, dialog: function() { var controls, form, imageType, select; controls = $.el('div', { diff --git a/script.coffee b/script.coffee index 1def04236..3eaf57b90 100644 --- a/script.coffee +++ b/script.coffee @@ -2325,9 +2325,10 @@ imgExpand = $.rm thumb.nextSibling expand: (thumb, url) -> + return if thumb.hidden a = thumb.parentNode img = $.el 'img', - src: if url then url else a.href + src: url or a.href if engine is 'gecko' and a.parentNode.className isnt 'op' filesize = $.x('preceding-sibling::span[@class="filesize"]', a).textContent max = filesize.match /(\d+)x/ @@ -2337,22 +2338,23 @@ imgExpand = $.add a, img error: -> + href = @parentNode.href thumb = @previousSibling imgExpand.contract thumb - src = @src.split '/' + src = href.split '/' if src[2] is 'images.4chan.org' and url = redirect.image src[3], src[5] setTimeout imgExpand.expand, 10000, thumb, url + return + url = href + '?' + Date.now() #navigator.online is not x-browser/os yet - else if engine is 'webkit' + if engine is 'webkit' req = $.ajax @src, (-> - setTimeout imgExpand.retry, 10000, thumb if @status isnt 404 + setTimeout imgExpand.expand, 10000, thumb, url if @status isnt 404 ), type: 'head', event: 'onreadystatechange' #Firefox returns a status code of 0 because of the same origin policy #Oprah doesn't send any request else unless g.dead - setTimeout imgExpand.retry, 10000, thumb - retry: (thumb) -> - imgExpand.expand thumb unless thumb.hidden + setTimeout imgExpand.expand, 10000, thumb, url dialog: -> controls = $.el 'div', From b49e110cc831fd13c591cb64aafcb813b65e618d Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 19 Jan 2012 22:21:36 +0100 Subject: [PATCH 10/15] Whoops. --- 4chan_x.user.js | 2 +- script.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 697732903..390432caa 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3025,7 +3025,7 @@ thumb = this.previousSibling; imgExpand.contract(thumb); src = href.split('/'); - if (src[2] === 'images.4chan.org' && (url = redirect.image(src[3], src[5]))) { + if (this.src.split('/')[2] === 'images.4chan.org' && (url = redirect.image(src[3], src[5]))) { setTimeout(imgExpand.expand, 10000, thumb, url); return; } diff --git a/script.coffee b/script.coffee index 3eaf57b90..8200e5902 100644 --- a/script.coffee +++ b/script.coffee @@ -2342,7 +2342,7 @@ imgExpand = thumb = @previousSibling imgExpand.contract thumb src = href.split '/' - if src[2] is 'images.4chan.org' and url = redirect.image src[3], src[5] + if @src.split('/')[2] is 'images.4chan.org' and url = redirect.image src[3], src[5] setTimeout imgExpand.expand, 10000, thumb, url return url = href + '?' + Date.now() From 36102e4927ac52283b2cb6d52c833e44f1aef91e Mon Sep 17 00:00:00 2001 From: seaweed Date: Thu, 19 Jan 2012 20:05:36 -0700 Subject: [PATCH 11/15] Bottom padding added to iHover --- script.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/script.coffee b/script.coffee index 8200e5902..1cd6ac8c1 100644 --- a/script.coffee +++ b/script.coffee @@ -2626,6 +2626,7 @@ Main = #ihover { max-height: 100%; max-width: 75%; + padding-bottom: 18px; } #navlinks { From 8cc25cd32ad3940dec8dfb69109b1024b6ccf0ca Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Thu, 19 Jan 2012 21:20:41 -0600 Subject: [PATCH 12/15] Scroll to top of reply instead of anchor --- 4chan_x.user.js | 2 +- script.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index cf7704076..f0619043f 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2994,7 +2994,7 @@ var rect, thumb; thumb = a.firstChild; if (thumb.hidden) { - rect = a.getBoundingClientRect(); + rect = a.parentNode.getBoundingClientRect(); if (rect.top < 0) d.body.scrollTop += rect.top; if (rect.left < 0) d.body.scrollLeft += rect.left; return imgExpand.contract(thumb); diff --git a/script.coffee b/script.coffee index c5e22e0bf..813abb1ed 100644 --- a/script.coffee +++ b/script.coffee @@ -2316,7 +2316,7 @@ imgExpand = toggle: (a) -> thumb = a.firstChild if thumb.hidden - rect = a.getBoundingClientRect() + rect = a.parentNode.getBoundingClientRect() d.body.scrollTop += rect.top if rect.top < 0 d.body.scrollLeft += rect.left if rect.left < 0 imgExpand.contract thumb From 6ba290514126871d9f8f1aa0cc188a9fce5d21ad Mon Sep 17 00:00:00 2001 From: e Date: Thu, 19 Jan 2012 23:34:19 -0500 Subject: [PATCH 13/15] Added cooldown sanity check -- properly. --- script.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script.coffee b/script.coffee index 0b00eb3bd..eb45abb37 100644 --- a/script.coffee +++ b/script.coffee @@ -1096,7 +1096,7 @@ cooldown = start: -> cooldown.duration = Math.ceil ($.get(g.BOARD+'/cooldown', 0) - Date.now()) / 1000 - return unless cooldown.duration > 0 + return unless 60 >= cooldown.duration > 0 for submit in $$ '#com_submit' submit.value = cooldown.duration submit.disabled = true From 8af14aee77705dec46cf7316718ba6d37c7977b1 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 20 Jan 2012 05:43:20 +0100 Subject: [PATCH 14/15] Update changelog and contributors; build. --- 4chan_x.user.js | 13 ++++++++----- Cakefile | 2 ++ changelog | 6 ++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index e25da3052..4ea5f2889 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -49,6 +49,8 @@ * * CONTRIBUTORS * + * e000 - cooldown sanity check + * ahokadesuka - scroll back when unexpanding images * Shou- - pentadactyl fixes * ferongr - new favicons * xat- - new favicons @@ -1455,12 +1457,12 @@ if (g.REPLY) return $('.postarea form').action += '?cooldown'; }, start: function() { - var submit, _i, _len, _ref; + var submit, _i, _len, _ref, _ref2; cooldown.duration = Math.ceil(($.get(g.BOARD + '/cooldown', 0) - Date.now()) / 1000); - if (!(cooldown.duration > 0)) return; - _ref = $$('#com_submit'); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - submit = _ref[_i]; + if (!((60 >= (_ref = cooldown.duration) && _ref > 0))) return; + _ref2 = $$('#com_submit'); + for (_i = 0, _len = _ref2.length; _i < _len; _i++) { + submit = _ref2[_i]; submit.value = cooldown.duration; submit.disabled = true; } @@ -3276,6 +3278,7 @@ #ihover {\ max-height: 100%;\ max-width: 75%;\ + padding-bottom: 18px;\ }\ \ #navlinks {\ diff --git a/Cakefile b/Cakefile index b95e2b2c5..905ebb561 100644 --- a/Cakefile +++ b/Cakefile @@ -56,6 +56,8 @@ HEADER = """ * * CONTRIBUTORS * + * e000 - cooldown sanity check + * ahokadesuka - scroll back when unexpanding images * Shou- - pentadactyl fixes * ferongr - new favicons * xat- - new favicons diff --git a/changelog b/changelog index 4af786053..0cccbf08a 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,10 @@ master +- ahokadesuka + Scroll back up when unexpanding images. +- e000 + Prevent absurd cooldown durations. +- Mayhem + Better image expanding reload, should fool CloudFlare's cache. 2.24.3 - Mayhem From 8c85a768cf792a274abc82e048810f145082d8c2 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 20 Jan 2012 05:46:08 +0100 Subject: [PATCH 15/15] Release 2.24.4. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 2 ++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4ea5f2889..83da74aae 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.24.3 +// @version 2.24.4 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -18,7 +18,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.24.3 + * 4chan X 2.24.4 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -202,7 +202,7 @@ NAMESPACE = '4chan_x.'; - VERSION = '2.24.3'; + VERSION = '2.24.4'; SECOND = 1000; diff --git a/Cakefile b/Cakefile index 905ebb561..0a2a0a0ea 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.24.3' +VERSION = '2.24.4' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index 0cccbf08a..d5257a6be 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master + +2.24.4 - ahokadesuka Scroll back up when unexpanding images. - e000 diff --git a/latest.js b/latest.js index 219917673..639387181 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.24.3'},'*'); +postMessage({version:'2.24.4'},'*'); diff --git a/script.coffee b/script.coffee index 5a587ac5b..9c6fb4728 100644 --- a/script.coffee +++ b/script.coffee @@ -121,7 +121,7 @@ conf = {} ) null, config NAMESPACE = '4chan_x.' -VERSION = '2.24.3' +VERSION = '2.24.4' SECOND = 1000 MINUTE = 60*SECOND HOUR = 60*MINUTE