From ea4622f72635900d8ca33f2ff48848d6a35e9894 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Wed, 27 Feb 2013 09:49:05 +0100 Subject: #2022 - Fix handling of watermark dialog errors. - admin_watermarks: changed header at end of form_add() from text/html to text/plain - admin_watermarks: added header at end of form_edit() and form_delete() just like form_add() (currently omitted) - admin_watermarks/gallery.dialog.js: removed unnecessary encode/decode workaround --- lib/gallery.dialog.js | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lib') diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index e9f4aa03..8fe85165 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -137,13 +137,6 @@ }, success: function(data) { if (data.html) { - if (data.result == "error") { - // This is an odd case that arises from the watermarks module. This is because we - // have a fake xhr, and we rawurlencode the results because the JS code that uploads - // the file buffers it in an iframe which entitizes the HTML and makes it difficult - // for the JS to process. See ticket #797. - data.html = unescape(data.html); - } $("#g-dialog").html(data.html); $("#g-dialog").dialog("option", "position", "center"); $("#g-dialog form :submit").removeClass("ui-state-disabled") -- cgit v1.2.3