From 9fa320838b19506d2bfd45f995298e75766530d9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 23 Mar 2015 01:09:16 +0100
Subject: wpaint has new dependencies – important!
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/wpaint.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'js/wpaint.js')

diff --git a/js/wpaint.js b/js/wpaint.js
index 9c619070..67d58fc2 100644
--- a/js/wpaint.js
+++ b/js/wpaint.js
@@ -13,12 +13,7 @@
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
  *   $config['additional_javascript'][] = 'js/ajax.js';
- *   $config['additional_javascript'][] = 'js/wPaint/lib/wColorPicker.min.js';
- *   $config['additional_javascript'][] = 'js/wPaint/wPaint.min.js';
- *   $config['additional_javascript'][] = 'js/wPaint/plugins/main/wPaint.menu.main.min.js';
- *   $config['additional_javascript'][] = 'js/wPaint/plugins/text/wPaint.menu.text.min.js';
- *   $config['additional_javascript'][] = 'js/wPaint/plugins/shapes/wPaint.menu.main.shapes.min.js';
- *   $config['additional_javascript'][] = 'js/wPaint/plugins/file/wPaint.menu.main.file.min.js';
+ *   $config['additional_javascript'][] = 'js/wPaint/8ch.js';
  *   $config['additional_javascript'][] = 'js/wpaint.js';
  *   $config['additional_javascript'][] = 'js/upload-selection.js';
  *
-- 
cgit v1.3


From d94143b6c67e1c48fee2f6ecb549fd3197a66378 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 31 Mar 2015 08:58:54 +0200
Subject: fix wpaint & file-selection interaction

---
 js/wpaint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/wpaint.js')

diff --git a/js/wpaint.js b/js/wpaint.js
index 67d58fc2..a245a22b 100644
--- a/js/wpaint.js
+++ b/js/wpaint.js
@@ -44,7 +44,7 @@ oekaki.init = function() {
   var oekaki_form = '<tr id="oekaki"><th>Oekaki</th><td><div id="wpaintctr"><div id="wpaintdiv"></div></div></td></tr>';
 
   // Add oekaki after the file input
-  $('form[name="post"]:not(#quick-reply) input[type="file"]').parent().parent().after(oekaki_form);
+  $('form[name="post"]:not(#quick-reply) [id="upload"]').after(oekaki_form);
 
   $('<link class="wpaintcss" rel="stylesheet" href="'+configRoot+'js/wPaint/wPaint.min.css" />').appendTo($("head"));
   $('<link class="wpaintcss" rel="stylesheet" href="'+configRoot+'js/wPaint/lib/wColorPicker.min.css" />').appendTo($("head"));
-- 
cgit v1.3