diff options
| author | czaks <marcin@6irc.net> | 2013-09-17 18:12:54 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-09-17 18:12:54 -0400 |
| commit | 3af05ed55b4c750da5c7efb23dad2141c18bbae2 (patch) | |
| tree | 01c108ba2d89d51c89dfeb3e402ab721f63297e5 | |
| parent | 65a0e133d4d17de21364dac1b19f1230723d7a7b (diff) | |
quick-reply.js and oekaki.js interoperation fix
| -rw-r--r-- | js/oekaki.js | 2 | ||||
| -rw-r--r-- | js/quick-reply.js | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/js/oekaki.js b/js/oekaki.js index 6197386d..e08f2d3f 100644 --- a/js/oekaki.js +++ b/js/oekaki.js @@ -16,7 +16,7 @@ var oekaki_form = '\ function init_oekaki() { // Add oekaki after the file input - $('input[type="file"]').parent().parent().after(oekaki_form); + $('form[name="post"]:not(#quick-reply) input[type="file"]').parent().parent().after(oekaki_form); // Add "edit in oekaki" links $(".fileinfo .unimportant").append(' <a href="javascript:void(0)" class="edit_in_oekaki">['+_('Edit in oekaki')+']</a>'); // Init oekaki vars diff --git a/js/quick-reply.js b/js/quick-reply.js index 267b6915..ea56b984 100644 --- a/js/quick-reply.js +++ b/js/quick-reply.js @@ -232,6 +232,11 @@ var show_quick_reply = function(){ $td.removeAttr('colspan'); } } + + // Remove oekaki if existent + if ($(this).is('#oekaki')) { + $(this).remove(); + } // Remove mod controls, because it looks shit. if ($td.find('input[type="checkbox"]').length) { |