diff options
author | shadlaws <shad@shadlaws.com> | 2013-02-12 17:19:28 +0100 |
---|---|---|
committer | shadlaws <shad@shadlaws.com> | 2013-02-12 17:19:28 +0100 |
commit | ec0363fd36f84c51d9fa3492004425ded2b729bd (patch) | |
tree | 1efd01fc7e918979c3ca3d8d4617952d79dbe14a /lib/gallery.panel.js | |
parent | 3b87ed54c203badadd9223e6f9a12395c72160d7 (diff) |
Updated success callbacks for gallery.panel.js and gallery.dialog.js - no longer need to save xhr ahead of success.
Tested and seems to work well, even with watermarks on Chrome (previously an issue).
Diffstat (limited to 'lib/gallery.panel.js')
-rw-r--r-- | lib/gallery.panel.js | 12 |
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; } |