summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-12-24 00:14:29 +0100
committerMichael Foster <savetheinterpod@gmail.com>2014-01-19 14:43:50 -0500
commit4eb08945b77a7b686147146ff3077f6b15c3c1fb (patch)
tree27c8d5eade6ea2bd83ebd8d0cd8bff703bc564da
parent8bd99be6f1b316c9af93ab151c182217360e0c35 (diff)
quick-reply.js: fix interaction with upload-selection.js
Conflicts: js/quick-reply.js
-rw-r--r--js/quick-reply.js10
1 files changed, 10 insertions, 0 deletions
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) {