From 4eb08945b77a7b686147146ff3077f6b15c3c1fb Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 24 Dec 2013 00:14:29 +0100
Subject: [PATCH] quick-reply.js: fix interaction with upload-selection.js

Conflicts:
	js/quick-reply.js
---
 js/quick-reply.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/quick-reply.js b/js/quick-reply.js
index c0d93ba7..1c0df4c3 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -235,6 +235,16 @@
 						$td.removeAttr('colspan');
 					}
 				}
+
+				// Remove oekaki if existent
+				if ($(this).is('#oekaki')) {
+					$(this).remove();
+				}
+
+				// Remove upload selection
+				if ($(this).is('#upload_selection')) {
+					$(this).remove();
+				}
 				
 				// Remove mod controls, because it looks shit.
 				if ($td.find('input[type="checkbox"]').length) {