From 9dbce3e85e86e77a27179a4a6daddc7735557d46 Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Mon, 29 Apr 2013 14:33:57 -0700 Subject: [PATCH] Fix #32 --- CHANGELOG.md | 6 ++++++ builds/4chan-X.js | 6 +++++- builds/4chan-X.user.js | 6 +++++- builds/crx/script.js | 6 +++++- src/Miscellaneous/Keybinds.coffee | 5 ++++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32ccd9e03..4f7218b36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +seaweedchan: +- Change ESC functionality in QR to autohide if Persistent QR is enabled + +MayhemYDG: +- Add nyafuu archiving for /w/ + ### 1.1.3 - 2013-04-28 seaweedchan: - Chrome doesn't get .null, so don't style it diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 1bee27b1b..b32f45c36 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -8291,7 +8291,11 @@ $('.close', notification).click(); } } else if (QR.nodes) { - QR.close(); + if (Conf['Persistent QR']) { + QR.hide(); + } else { + QR.close(); + } } break; case Conf['Spoiler tags']: diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 81fa6dd0b..474b0f52d 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -8312,7 +8312,11 @@ $('.close', notification).click(); } } else if (QR.nodes) { - QR.close(); + if (Conf['Persistent QR']) { + QR.hide(); + } else { + QR.close(); + } } break; case Conf['Spoiler tags']: diff --git a/builds/crx/script.js b/builds/crx/script.js index 628714297..bf2eb07a6 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -8296,7 +8296,11 @@ $('.close', notification).click(); } } else if (QR.nodes) { - QR.close(); + if (Conf['Persistent QR']) { + QR.hide(); + } else { + QR.close(); + } } break; case Conf['Spoiler tags']: diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee index 58051f592..d64fbc49e 100644 --- a/src/Miscellaneous/Keybinds.coffee +++ b/src/Miscellaneous/Keybinds.coffee @@ -41,7 +41,10 @@ Keybinds = for notification in notifications $('.close', notification).click() else if QR.nodes - QR.close() + if Conf['Persistent QR'] + QR.hide() + else + QR.close() when Conf['Spoiler tags'] return if target.nodeName isnt 'TEXTAREA' Keybinds.tags 'spoiler', target