summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-02-24 22:52:32 -0800
committerBharat Mediratta <bharat@menalto.com>2011-02-24 22:52:32 -0800
commit443e49b2ae88545f5a56842f2283f4f98dc7b65f (patch)
tree3c06891e91602c9ed0997ac07bafafeb758e7f66
parent8437a85ac87f8fc6b4ee420bde59eda683140063 (diff)
Revert overeager escaping introduced in
https://github.com/gallery/gallery3/commit/bb35aefffbc287efc9823abd4b0e451b86c37378 in an attempt to resolve #797. Fixes #1640.
-rw-r--r--lib/gallery.dialog.js4
-rw-r--r--lib/gallery.panel.js2
2 files changed, 3 insertions, 3 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);
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index e0605ca3..0683c531 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.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;
}