From abb3b0e5b4277fcae1b7eb44a5ecaf37d7765e9e Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Sat, 27 Jul 2013 03:58:19 -0700
Subject: [PATCH] Disable Quote Threading by default

---
 LICENSE                       | 2 +-
 builds/appchan-x.user.js      | 6 +++---
 builds/crx/script.js          | 6 +++---
 src/General/Config.coffee     | 2 +-
 src/Posting/QuickReply.coffee | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/LICENSE b/LICENSE
index 02c052e71..6c3977be2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.2.0 - 2013-07-26
+* appchan x - Version 2.2.0 - 2013-07-27
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 622d1381a..211c3d2fc 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -18,7 +18,7 @@
 // ==/UserScript==
 
 /*
-* appchan x - Version 2.2.0 - 2013-07-26
+* appchan x - Version 2.2.0 - 2013-07-27
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -220,7 +220,7 @@
         'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'],
         'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'],
         'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'],
-        'Quote Threading': [true, 'Thread conversations']
+        'Quote Threading': [false, 'Thread conversations']
       }
     },
     imageExpansion: {
@@ -8354,7 +8354,7 @@
         post: post,
         isReply: isReply
       });
-      URL = threadID === postID ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
+      URL = !isReply ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
       if (URL) {
         if (Conf['Open Post in New Tab']) {
           $.open(URL);
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 09068eb90..61117e9f2 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* appchan x - Version 2.2.0 - 2013-07-26
+* appchan x - Version 2.2.0 - 2013-07-27
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -201,7 +201,7 @@
         'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'],
         'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'],
         'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'],
-        'Quote Threading': [true, 'Thread conversations']
+        'Quote Threading': [false, 'Thread conversations']
       }
     },
     imageExpansion: {
@@ -8331,7 +8331,7 @@
         post: post,
         isReply: isReply
       });
-      URL = threadID === postID ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
+      URL = !isReply ? "/" + g.BOARD + "/res/" + threadID : g.VIEW === 'index' && !QR.cooldown.auto && Conf['Open Post in New Tab'] ? "/" + g.BOARD + "/res/" + threadID + "#p" + postID : void 0;
       if (URL) {
         if (Conf['Open Post in New Tab']) {
           $.open(URL);
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index f27789cca..7cd4b7e91 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -358,7 +358,7 @@ Config =
         'Add \'(Cross-thread)\' to cross-threads quotes.'
       ]
       'Quote Threading': [
-        true
+        false
         'Thread conversations'
       ]
 
diff --git a/src/Posting/QuickReply.coffee b/src/Posting/QuickReply.coffee
index 0708cca18..ecb2e8e32 100644
--- a/src/Posting/QuickReply.coffee
+++ b/src/Posting/QuickReply.coffee
@@ -1195,10 +1195,11 @@ QR =
 
     QR.cooldown.set {req, post, isReply}
 
-    URL = if threadID is postID # new thread
+    URL = unless isReply # new thread
       "/#{g.BOARD}/res/#{threadID}"
     else if g.VIEW is 'index' and !QR.cooldown.auto and Conf['Open Post in New Tab'] # replying from the index
       "/#{g.BOARD}/res/#{threadID}#p#{postID}"
+
     if URL
       if Conf['Open Post in New Tab']
         $.open URL