summaryrefslogtreecommitdiff
path: root/lib/gallery.dialog.js
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2011-04-22 16:54:55 +0000
committerNathan Kinkade <nath@nkinka.de>2011-04-22 16:54:55 +0000
commit1f7c1f18c651c58048e92d615c71ac0fe6691c10 (patch)
tree4527c4bc08000a07c180cd1fe81792d71195d58b /lib/gallery.dialog.js
parentde6f3fce9110b777d61dec97f2a3a61d887a5ccd (diff)
parent55da59c942c0f7171b515f0718fea8506ed4b116 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'lib/gallery.dialog.js')
-rw-r--r--lib/gallery.dialog.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index ec187186..087b00ab 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -48,7 +48,7 @@
var content = "";
if (mimeType[1] == "application/json") {
data = JSON.parse(data);
- content = unescape(data.html);
+ content = data.html;
} else {
content = data;
}
@@ -160,7 +160,7 @@
}
if (data.html) {
- $("#g-dialog").html(unescape(data.html));
+ $("#g-dialog").html(data.html);
$("#g-dialog").dialog("option", "position", "center");
$("#g-dialog form :submit").removeClass("ui-state-disabled")
.attr("disabled", null);