summaryrefslogtreecommitdiff
path: root/lib/gallery.panel.js
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2013-02-12 09:25:21 -0800
committerBharat Mediratta <bharat@menalto.com>2013-02-12 09:25:21 -0800
commit6e8a647d0b8de137b24fd604eb6c8ba70457be3c (patch)
treec58187f0642f69c370b0b60d46e080c86a01fc2a /lib/gallery.panel.js
parentacf4aa01b9dc11febbe4f02be5c43ec905990d98 (diff)
parentdc5b1a715b6d3dee117d23d460b2cbc521d326d3 (diff)
Merge pull request #137 from shadlaws/jquery_19_success_xhr
Updated success callbacks for gallery.panel.js and gallery.dialog.js
Diffstat (limited to 'lib/gallery.panel.js')
-rw-r--r--lib/gallery.panel.js12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 0683c531..e5028f2a 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -34,21 +34,11 @@
$.ajax({
url: sHref,
type: "GET",
- beforeSend: function(xhr) {
- // Until we convert to jquery 1.4, we need to save the
- // XMLHttpRequest object
- this.xhrData = xhr;
- },
success: function(data, textStatus, xhr) {
- // Pre jquery 1.4, get the saved XMLHttpRequest object
- if (xhr == undefined) {
- xhr = this.xhrData;
- }
var mimeType = /^(\w+\/\w+)\;?/.exec(xhr.getResponseHeader("Content-Type"));
var content = "";
if (mimeType[1] == "application/json") {
- data = JSON.parse(data);
- content = data.html;
+ content = unescape(data.html);
} else {
content = data;
}