diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gallery.dialog.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index b1442390..b4557493 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -139,6 +139,13 @@ }, 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") |