From 9127179e0ddfdcb803eefcd954e58d21cf4d7d24 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 7 Mar 2014 04:22:37 +0100 Subject: [PATCH 01/12] Nuke the `Enable 4chan's Extension` setting. --- src/General/Config.coffee | 1 - src/General/Settings.coffee | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 015c137be..d1c383853 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -1,7 +1,6 @@ Config = main: 'Miscellaneous': - 'Enable 4chan\'s Extension': [false, 'Compatibility between <%= meta.name %> and 4chan\'s inline extension is NOT guaranteed.'] 'Desktop Notifications': [true, 'Enables desktop notifications across various <%= meta.name %> features.'] 'Announcement Hiding': [true, 'Add button to hide 4chan announcements.'] '404 Redirect': [true, 'Redirect dead threads and images.'] diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index b73d9341a..3c934d32b 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -11,18 +11,6 @@ Settings = el: link order: 111 - # 4chan settings link - link = $.el 'a', - className: 'fourchan-settings-link' - textContent: '4chan Settings' - href: 'javascript:;' - $.on link, 'click', -> $.id('settingsWindowLink').click() - $.event 'AddMenuEntry', - type: 'header' - el: link - order: 110 - open: -> Conf['Enable 4chan\'s Extension'] - Settings.addSection 'Main', Settings.main Settings.addSection 'Filter', Settings.filter Settings.addSection 'QR', Settings.qr @@ -33,7 +21,6 @@ Settings = $.on d, 'AddSettingsSection', Settings.addSection $.on d, 'OpenSettings', (e) -> Settings.open e.detail - return if Conf['Enable 4chan\'s Extension'] settings = JSON.parse(localStorage.getItem '4chan-settings') or {} return if settings.disableAll settings.disableAll = true From adeb601bd10153acdd22614f032b9a5917823982 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:13:08 +0100 Subject: [PATCH 02/12] Update deps. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 00d4be137..14ea86a2b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "font-awesome": "~4.0.3", "grunt": "~0.4.2", "grunt-bump": "~0.0.13", - "grunt-concurrent": "~0.4.3", + "grunt-concurrent": "~0.5.0", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-coffee": "~0.10.0", "grunt-contrib-compress": "~0.7.0", From f7262ba0dcc820b01a95a577da4323b6b43329c5 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:13:26 +0100 Subject: [PATCH 03/12] Remove mlp form foolz beta as it is conflicting with Heinessen not offering post fetching. Fix #1493. --- json/archives.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/archives.json b/json/archives.json index 5cf5c06dd..5afc45287 100644 --- a/json/archives.json +++ b/json/archives.json @@ -114,6 +114,6 @@ "https": true, "withCredentials": true, "software": "foolfuuka", - "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "mlp", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], + "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], "files": ["a", "biz", "d", "diy", "gd", "jp", "m", "s4s", "sci", "tg", "u", "vg", "vp", "vr", "wsg"] }] From 06da6b0c9e64e94a9819222f31e889bf6fb32a6e Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:17:33 +0100 Subject: [PATCH 04/12] Nuke `Announcement Hiding` setting. --- src/General/Config.coffee | 1 - src/Miscellaneous/PSAHiding.coffee | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/General/Config.coffee b/src/General/Config.coffee index d1c383853..67d4a9890 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -2,7 +2,6 @@ Config = main: 'Miscellaneous': 'Desktop Notifications': [true, 'Enables desktop notifications across various <%= meta.name %> features.'] - 'Announcement Hiding': [true, 'Add button to hide 4chan announcements.'] '404 Redirect': [true, 'Redirect dead threads and images.'] 'Keybinds': [true, 'Bind actions to keyboard shortcuts.'] 'Linkify': [true, 'Convert text links into hyperlinks.'] diff --git a/src/Miscellaneous/PSAHiding.coffee b/src/Miscellaneous/PSAHiding.coffee index 2c083ac2f..715b8dc2d 100644 --- a/src/Miscellaneous/PSAHiding.coffee +++ b/src/Miscellaneous/PSAHiding.coffee @@ -1,7 +1,5 @@ PSAHiding = init: -> - return if !Conf['Announcement Hiding'] - $.addClass doc, 'hide-announcement', 'hide-announcement-enabled' $.on d, '4chanXInitFinished', @setup From e294721ad5ce0a7b4cfc23984a8632fee0923134 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:18:27 +0100 Subject: [PATCH 05/12] Use the svg david badge. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b4a245cd..2cc822153 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 4chan X [![devDependency Status](https://david-dm.org/MayhemYDG/4chan-x/dev-status.png)](https://david-dm.org/MayhemYDG/4chan-x#info=devDependencies) +# 4chan X [![devDependency Status](https://david-dm.org/MayhemYDG/4chan-x/dev-status.svg?theme=shields.io)](https://david-dm.org/MayhemYDG/4chan-x#info=devDependencies) Get it [here](https://4chan-x.just-believe.in/). From 3b183d728310d8f568a5965998d22124e7a6549e Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:29:30 +0100 Subject: [PATCH 06/12] Nuke toggling the header auto-hide by clicking on its border. --- CHANGELOG.md | 3 +++ css/style.css | 14 +++----------- html/General/Header.html | 2 +- src/General/Header.coffee | 15 ++------------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc2361067..974d9ca29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +- Clicking on the border of the Header will not toggle `Header auto-hide` anymore. + You can still change the setting in the Header menu → Header. + ## 3.19.0 - *2014-02-22* - Thread and post hiding changes: diff --git a/css/style.css b/css/style.css index e04a08af5..bfab2413a 100644 --- a/css/style.css +++ b/css/style.css @@ -159,26 +159,18 @@ a[href="javascript:;"] { -webkit-transform: translateY(100%); transform: translateY(100%); } -#toggle-header-bar { +#header-bar-hitzone { left: 0; right: 0; height: 10px; position: absolute; } -#header.top #toggle-header-bar { - cursor: n-resize; +#header.top #header-bar-hitzone { bottom: -10px; } -#header.bottom #toggle-header-bar { - cursor: s-resize; +#header.bottom #header-bar-hitzone { top: -10px; } -#header.top #header-bar.autohide #toggle-header-bar { - cursor: s-resize; -} -#header.bottom #header-bar.autohide #toggle-header-bar { - cursor: n-resize; -} #header-bar a:not(.entry) { text-decoration: none; padding: 1px; diff --git a/html/General/Header.html b/html/General/Header.html index 2e0088f42..8ded91ba0 100644 --- a/html/General/Header.html +++ b/html/General/Header.html @@ -4,6 +4,6 @@ -
+
diff --git a/src/General/Header.coffee b/src/General/Header.coffee index 9f072a555..85bce6f61 100644 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -5,7 +5,7 @@ Header = innerHTML: <%= importHTML('General/Header') %> @bar = $ '#header-bar', headerEl - @toggle = $ '#toggle-header-bar', @bar + @toggle = $ '#header-bar-hitzone', @bar @noticesRoot = $ '#notifications', headerEl @menu = new UI.Menu 'header' @@ -15,7 +15,6 @@ Header = href: 'javascript:;' $.on menuButton, 'click', @menuToggle @addShortcut menuButton, 0 - $.on @toggle, 'mousedown', @toggleBarVisibility $.on window, 'load hashchange', Header.hashScroll $.on d, 'CreateNotification', @createNotification @@ -178,22 +177,12 @@ Header = setBarVisibility: (hide) -> Header.headerToggler.checked = hide - $.event 'CloseMenu' (if hide then $.addClass else $.rmClass) Header.bar, 'autohide' toggleBarVisibility: (e) -> - return if e.type is 'mousedown' and e.button isnt 0 # not LMB - hide = if @nodeName is 'INPUT' - @checked - else - !$.hasClass Header.bar, 'autohide' + hide = @checked Conf['Header auto-hide'] = hide $.set 'Header auto-hide', hide Header.setBarVisibility hide - message = if hide - 'The header bar will automatically hide itself.' - else - 'The header bar will remain visible.' - new Notice 'info', message, 2 setHideBarOnScroll: (hide) -> Header.scrollHeaderToggler.checked = hide From 84a53c5d41e2a6e329644b3dee18ca8d7faa8ecf Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:32:15 +0100 Subject: [PATCH 07/12] Release 4chan X v3.19.1. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 974d9ca29..30e35141b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.19.1 - *2014-03-10* + - Clicking on the border of the Header will not toggle `Header auto-hide` anymore. You can still change the setting in the Header menu → Header. diff --git a/package.json b/package.json index 14ea86a2b..f287d0cf7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.19.0", + "version": "3.19.1", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X", From 2ae6ae1dfd59844d35c1aab4436f9b509670e168 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 10 Mar 2014 09:44:49 +0100 Subject: [PATCH 08/12] Fix #1499. --- src/Filtering/PostHiding.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee index 4a92f8ec9..d36796929 100644 --- a/src/Filtering/PostHiding.coffee +++ b/src/Filtering/PostHiding.coffee @@ -145,6 +145,7 @@ PostHiding = el: $.el 'a', href: 'javascript:;' order: 20 open: (post) -> + return false if post.isReply @el.textContent = if post.isHidden 'Unhide thread' else From d878d1fb4fa1e05d636138c138b4200be329c355 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 12 Mar 2014 11:31:24 +0100 Subject: [PATCH 09/12] Update deps. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f287d0cf7..d98dd4485 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "grunt-contrib-compress": "~0.7.0", "grunt-contrib-concat": "~0.3.0", "grunt-contrib-copy": "~0.5.0", - "grunt-contrib-watch": "~0.5.3", + "grunt-contrib-watch": "~0.6.0", "grunt-shell": "~0.6.4", "load-grunt-tasks": "~0.4.0" }, From 19e13157609ba122b739a4bb562b2d0e293898f0 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 12 Mar 2014 11:36:50 +0100 Subject: [PATCH 10/12] Fix #1503, Fix #1504. --- src/Menu/Menu.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee index 537d87e07..9b8750a84 100644 --- a/src/Menu/Menu.coffee +++ b/src/Menu/Menu.coffee @@ -30,4 +30,5 @@ Menu = clone toggle: (e) -> - Menu.menu.toggle e, @, Get.postFromNode @ + fullID = $.x('ancestor::*[@data-full-i-d]', @).dataset.fullID + Menu.menu.toggle e, @, g.posts[fullID] From fd942b345b9422663282c88b38a6322157fb8426 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 12 Mar 2014 11:42:29 +0100 Subject: [PATCH 11/12] Changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e35141b..c196fdc73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Bug fixes. + ### 3.19.1 - *2014-03-10* - Clicking on the border of the Header will not toggle `Header auto-hide` anymore. From d649e5e21e6300698641869b4b68d69b72d55e10 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 12 Mar 2014 11:42:35 +0100 Subject: [PATCH 12/12] Release 4chan X v3.19.2. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c196fdc73..6cd0bbcb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.19.2 - *2014-03-12* + - Bug fixes. ### 3.19.1 - *2014-03-10* diff --git a/package.json b/package.json index d98dd4485..e316fa99e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.19.1", + "version": "3.19.2", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X",