From 3ac306b6ea01cd23043f2e88cd7a4236da54b282 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Thu, 12 Mar 2015 12:19:30 +0800
Subject: [PATCH] Fix AJAX bug, wasn't triggering if called immediately from QR

---
 inc/instance-config.php |  4 ++--
 js/ajax.js              | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/inc/instance-config.php b/inc/instance-config.php
index b5c93333..5cb25ffa 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -115,7 +115,6 @@
 	$config['additional_javascript'][] = 'js/expand.js';
 	$config['additional_javascript'][] = 'js/titlebar-notifications.js';
 	$config['additional_javascript'][] = 'js/auto-reload.js';
-	$config['additional_javascript'][] = 'js/quick-reply.js';
 	$config['additional_javascript'][] = 'js/options/user-css.js';
 	$config['additional_javascript'][] = 'js/options/user-js.js';
 	$config['additional_javascript'][] = 'js/forced-anon.js';
@@ -129,6 +128,7 @@
 	$config['additional_javascript'][] = 'js/download-original.js';
 	$config['additional_javascript'][] = 'js/thread-watcher.js';
 	$config['additional_javascript'][] = 'js/ajax.js';
+	$config['additional_javascript'][] = 'js/quick-reply.js';
 	$config['additional_javascript'][] = 'js/show-own-posts.js';
 	$config['additional_javascript'][] = 'js/youtube.js';
 	$config['additional_javascript'][] = 'js/comment-toolbar.js';
@@ -213,7 +213,7 @@ $config['show_sages'] = false;
 $config['katex'] = false;
 $config['enable_antibot'] = false;
 $config['spam']['unicode'] = false;
-$config['twig_cache'] = true;
+$config['twig_cache'] = false;
 // 8chan specific mod pages
 require '8chan-mod-pages.php';
 	
diff --git a/js/ajax.js b/js/ajax.js
index e1c91536..3e41e681 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -12,12 +12,9 @@
  *
  */
 
-$(window).ready(function() {
++function() {
 	var settings = new script_settings('ajax');
 	var do_not_ajax = false;
-
-	// Enable submit button if disabled (cache problem)
-	$('input[type="submit"]').removeAttr('disabled');
 	
 	var setup_form = function($form) {
 		$form.submit(function() {
@@ -46,7 +43,7 @@ $(window).ready(function() {
 			};
 
 			$.ajax({
-				url: '/post.php',
+				url: configRoot+'post.php',
 				type: 'POST',
 				xhr: function() {
 					var xhr = $.ajaxSettings.xhr();
@@ -137,9 +134,13 @@ $(window).ready(function() {
 			return false;
 		});
 	};
-	setup_form($('div#post-form-outer'));
 	$(window).on('quick-reply', function() {
-		$('div#quick-reply').off('submit');
+		$('div#quick-reply form').off('submit');
 		setup_form($('div#quick-reply'));
 	});
-});
+	onready(function(){
+		// Enable submit button if disabled (cache problem)
+		$('input[type="submit"]').removeAttr('disabled');
+		setup_form($('div#post-form-outer'));
+	});
+}();