From 2550ab73c1d8a5dc60545da224e62979e8ea57e8 Mon Sep 17 00:00:00 2001
From: Jordan Bates <saudrapsmann@gmail.com>
Date: Tue, 14 May 2013 19:16:55 -0700
Subject: [PATCH] QR shortcut and link changes Don't close QR if Persistent,
 and Don't close QR on Reply to Thread click

---
 builds/4chan-X.js             | 19 ++++++++-----------
 builds/4chan-X.user.js        | 19 ++++++++-----------
 builds/crx/script.js          | 19 ++++++++-----------
 src/Posting/QuickReply.coffee | 18 ++++++++----------
 4 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 3d1664d77..360384816 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -4629,14 +4629,15 @@
           href: 'javascript:;'
         });
         $.on(sc, 'click', function() {
-          if (!QR.nodes || QR.nodes.el.hidden) {
+          if (Conf['Persistent QR'] || !QR.nodes || QR.nodes.el.hidden) {
             $.event('CloseMenu');
             QR.open();
             QR.nodes.com.focus();
+            return $.rmClass(this, 'disabled');
           } else {
             QR.close();
+            return $.addClass(this, 'disabled');
           }
-          return $.toggleClass(this, 'disabled');
         });
         Header.addShortcut(sc);
       }
@@ -4669,15 +4670,11 @@
         className: "qr-link"
       });
       $.on(link, 'click', function() {
-        if (!QR.nodes || QR.nodes.el.hidden) {
-          $.event('CloseMenu');
-          QR.open();
-          QR.nodes.com.focus();
-          if (Conf['QR Shortcut']) {
-            return $.rmClass($('.qr-shortcut'), 'disabled');
-          }
-        } else {
-          return QR.close();
+        $.event('CloseMenu');
+        QR.open();
+        QR.nodes.com.focus();
+        if (Conf['QR Shortcut']) {
+          return $.rmClass($('.qr-shortcut'), 'disabled');
         }
       });
       $.before($.id('postForm'), link);
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 3b1a2b3eb..d76012f2a 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -4613,14 +4613,15 @@
           href: 'javascript:;'
         });
         $.on(sc, 'click', function() {
-          if (!QR.nodes || QR.nodes.el.hidden) {
+          if (Conf['Persistent QR'] || !QR.nodes || QR.nodes.el.hidden) {
             $.event('CloseMenu');
             QR.open();
             QR.nodes.com.focus();
+            return $.rmClass(this, 'disabled');
           } else {
             QR.close();
+            return $.addClass(this, 'disabled');
           }
-          return $.toggleClass(this, 'disabled');
         });
         Header.addShortcut(sc);
       }
@@ -4653,15 +4654,11 @@
         className: "qr-link"
       });
       $.on(link, 'click', function() {
-        if (!QR.nodes || QR.nodes.el.hidden) {
-          $.event('CloseMenu');
-          QR.open();
-          QR.nodes.com.focus();
-          if (Conf['QR Shortcut']) {
-            return $.rmClass($('.qr-shortcut'), 'disabled');
-          }
-        } else {
-          return QR.close();
+        $.event('CloseMenu');
+        QR.open();
+        QR.nodes.com.focus();
+        if (Conf['QR Shortcut']) {
+          return $.rmClass($('.qr-shortcut'), 'disabled');
         }
       });
       $.before($.id('postForm'), link);
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 2c7f2c136..c083db8c1 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -4615,14 +4615,15 @@
           href: 'javascript:;'
         });
         $.on(sc, 'click', function() {
-          if (!QR.nodes || QR.nodes.el.hidden) {
+          if (Conf['Persistent QR'] || !QR.nodes || QR.nodes.el.hidden) {
             $.event('CloseMenu');
             QR.open();
             QR.nodes.com.focus();
+            return $.rmClass(this, 'disabled');
           } else {
             QR.close();
+            return $.addClass(this, 'disabled');
           }
-          return $.toggleClass(this, 'disabled');
         });
         Header.addShortcut(sc);
       }
@@ -4655,15 +4656,11 @@
         className: "qr-link"
       });
       $.on(link, 'click', function() {
-        if (!QR.nodes || QR.nodes.el.hidden) {
-          $.event('CloseMenu');
-          QR.open();
-          QR.nodes.com.focus();
-          if (Conf['QR Shortcut']) {
-            return $.rmClass($('.qr-shortcut'), 'disabled');
-          }
-        } else {
-          return QR.close();
+        $.event('CloseMenu');
+        QR.open();
+        QR.nodes.com.focus();
+        if (Conf['QR Shortcut']) {
+          return $.rmClass($('.qr-shortcut'), 'disabled');
         }
       });
       $.before($.id('postForm'), link);
diff --git a/src/Posting/QuickReply.coffee b/src/Posting/QuickReply.coffee
index f216f69ec..0bd9c108d 100644
--- a/src/Posting/QuickReply.coffee
+++ b/src/Posting/QuickReply.coffee
@@ -11,13 +11,14 @@ QR =
         title: 'Quick Reply'
         href: 'javascript:;'
       $.on sc, 'click', ->
-        if !QR.nodes or QR.nodes.el.hidden
+        if Conf['Persistent QR'] or !QR.nodes or QR.nodes.el.hidden
           $.event 'CloseMenu'
           QR.open()
           QR.nodes.com.focus()
+          $.rmClass @, 'disabled'
         else
           QR.close()
-        $.toggleClass @, 'disabled'
+          $.addClass @, 'disabled'
 
       Header.addShortcut sc
 
@@ -40,14 +41,11 @@ QR =
       title:  title
       className: "qr-link"
     $.on link, 'click', ->
-      if !QR.nodes or QR.nodes.el.hidden
-        $.event 'CloseMenu'
-        QR.open()
-        QR.nodes.com.focus()
-        if Conf['QR Shortcut']
-          $.rmClass $('.qr-shortcut'), 'disabled'
-      else
-        QR.close()
+      $.event 'CloseMenu'
+      QR.open()
+      QR.nodes.com.focus()
+      if Conf['QR Shortcut']
+        $.rmClass $('.qr-shortcut'), 'disabled'
 
     $.before $.id('postForm'), link