From 31584986e47b2e796f10c547c115080e028937ed Mon Sep 17 00:00:00 2001 From: czaks Date: Wed, 29 Jan 2014 22:05:59 +0100 Subject: wpaint.js: second iteration; not ready yet; vichan-devel#20 --- js/upload-selection.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'js/upload-selection.js') diff --git a/js/upload-selection.js b/js/upload-selection.js index aa1448d7..9c4ebd34 100644 --- a/js/upload-selection.js +++ b/js/upload-selection.js @@ -7,8 +7,8 @@ * * Usage: * $config['additional_javascript'][] = 'js/jquery.min.js'; + * //$config['additional_javascript'][] = 'js/wpaint.js'; * $config['additional_javascript'][] = 'js/upload-selection.js'; - * //$config['additional_javascript'][] = 'js/oekaki.js'; //WARNING: unsupported * */ @@ -16,7 +16,7 @@ $(function(){ var enabled_file = true; var enabled_url = $("#upload_url").length > 0; var enabled_embed = $("#upload_embed").length > 0; - var enabled_oekaki = $("#oekaki").length > 0; + var enabled_oekaki = typeof window.oekaki != "undefined"; var disable_all = function() { $("#upload").hide(); @@ -26,8 +26,8 @@ $(function(){ $("#oekaki").hide(); if (enabled_oekaki) { - if ($("#confirm_oekaki").is(':checked')) { - $("#confirm_oekaki").click(); + if (window.oekaki.initialized) { + window.oekaki.deinit(); } } }; @@ -55,9 +55,7 @@ $(function(){ disable_all(); $("#oekaki").show(); - if (!$("#confirm_oekaki").is(':checked')) { - $("#confirm_oekaki").click(); - } + window.oekaki.init(); }; if (enabled_url || enabled_embed || enabled_oekaki) { -- cgit v1.3