From 7f6b06dcd3b8b44ef2478bfed25ba3571eee6418 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 10 May 2013 04:53:02 +0200 Subject: [PATCH 1/4] Update deps. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a696844a..d9ade39d0 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "grunt-contrib-compress": "~0.5.0", "grunt-contrib-concat": "~0.3.0", "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-watch": "~0.4.1", + "grunt-contrib-watch": "~0.4.2", "grunt-shell": "~0.2.2" }, "repository": { From 0fec8533def5b322f8cfa66cb9e0edb949367c3a Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 10 May 2013 05:43:40 +0200 Subject: [PATCH 2/4] Use the announcement's new data-utc value for hiding it. --- src/Miscellaneous/PSAHiding.coffee | 42 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/Miscellaneous/PSAHiding.coffee b/src/Miscellaneous/PSAHiding.coffee index ed5c50b9f..ada322e4e 100644 --- a/src/Miscellaneous/PSAHiding.coffee +++ b/src/Miscellaneous/PSAHiding.coffee @@ -25,6 +25,7 @@ PSAHiding = unless psa = $.id 'globalMessage' $.rmClass doc, 'hide-announcement' + $.rmClass doc, 'hide-announcement-enabled' return PSAHiding.btn = btn = $.el 'a', @@ -34,32 +35,35 @@ PSAHiding = href: 'javascript:;' $.on btn, 'click', PSAHiding.toggle - $.get 'hiddenPSAs', [], (item) -> - PSAHiding.sync item['hiddenPSAs'] + # XXX remove hiddenPSAs workaround in the future. + items = + hiddenPSA: 0 + hiddenPSAs: null + + $.get items, ({hiddenPSA, hiddenPSAs}) -> + if hiddenPSAs + $.delete 'hiddenPSAs' + if psa.textContent.replace(/\W+/g, '').toLowerCase() in hiddenPSAs + hiddenPSA = +$.id('globalMessage').dataset.utc + $.set 'hiddenPSA', hiddenPSA + PSAHiding.sync hiddenPSA $.before psa, btn $.rmClass doc, 'hide-announcement' - $.sync 'hiddenPSAs', PSAHiding.sync + $.sync 'hiddenPSA', PSAHiding.sync toggle: (e) -> - hide = $.hasClass @, 'hide-announcement' - text = PSAHiding.trim $.id 'globalMessage' - $.get 'hiddenPSAs', [], ({hiddenPSAs}) -> - if hide - hiddenPSAs.push text - hiddenPSAs = hiddenPSAs[-5..] - else - $.event 'CloseMenu' - i = hiddenPSAs.indexOf text - hiddenPSAs.splice i, 1 - PSAHiding.sync hiddenPSAs - $.set 'hiddenPSAs', hiddenPSAs - sync: (hiddenPSAs) -> + if $.hasClass @, 'hide-announcement' + UTC = +$.id('globalMessage').dataset.utc + $.set 'hiddenPSA', UTC + else + $.event 'CloseMenu' + $.delete 'hiddenPSA' + PSAHiding.sync UTC + sync: (UTC) -> psa = $.id 'globalMessage' - psa.hidden = PSAHiding.btn.hidden = if PSAHiding.trim(psa) in hiddenPSAs + psa.hidden = PSAHiding.btn.hidden = if UTC and UTC >= +psa.dataset.utc true else false if (hr = psa.nextElementSibling) and hr.nodeName is 'HR' hr.hidden = psa.hidden - trim: (psa) -> - psa.textContent.replace(/\W+/g, '').toLowerCase() From 7ad882ff2de98ae325477d6c14cee18a1c0f88bf Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 10 May 2013 05:47:19 +0200 Subject: [PATCH 3/4] Only add the "Show announcement" to the header's menu if there is an annoucement on this page. This simplifies the open function. --- src/Miscellaneous/PSAHiding.coffee | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/Miscellaneous/PSAHiding.coffee b/src/Miscellaneous/PSAHiding.coffee index ada322e4e..9f69780b0 100644 --- a/src/Miscellaneous/PSAHiding.coffee +++ b/src/Miscellaneous/PSAHiding.coffee @@ -5,20 +5,6 @@ PSAHiding = $.addClass doc, 'hide-announcement' $.addClass doc, 'hide-announcement-enabled' - entry = - type: 'header' - el: $.el 'a', - textContent: 'Show announcement' - className: 'show-announcement' - href: 'javascript:;' - order: 50 - open: -> - if $.id('globalMessage')?.hidden - return true - false - $.event 'AddMenuEntry', entry - - $.on entry.el, 'click', PSAHiding.toggle $.on d, '4chanXInitFinished', @setup setup: -> $.off d, '4chanXInitFinished', PSAHiding.setup @@ -28,6 +14,17 @@ PSAHiding = $.rmClass doc, 'hide-announcement-enabled' return + entry = + type: 'header' + el: $.el 'a', + textContent: 'Show announcement' + className: 'show-announcement' + href: 'javascript:;' + order: 50 + open: -> psa.hidden + $.event 'AddMenuEntry', entry + $.on entry.el, 'click', PSAHiding.toggle + PSAHiding.btn = btn = $.el 'a', innerHTML: '[ - ]' title: 'Hide announcement.' From 9ba9fa451cf105b3d28490b8ece62a131eeb53a1 Mon Sep 17 00:00:00 2001 From: Wohlfe Date: Fri, 10 May 2013 01:14:11 -0300 Subject: [PATCH 4/4] Update archives.json --- json/archives.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/archives.json b/json/archives.json index a1f32bebc..3ac796df7 100644 --- a/json/archives.json +++ b/json/archives.json @@ -68,8 +68,8 @@ "http": true, "https": true, "software": "foolfuuka", - "boards": ["adv", "asp", "cm", "e", "i", "n", "o", "p", "s", "t", "trv", "y"], - "files": ["adv", "asp", "cm", "e", "i", "n", "o", "p", "s", "t", "trv", "y"] + "boards": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"], + "files": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"] }, { "uid": 7, "name": "Install Gentoo",