diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-06 14:12:00 -0700 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-06 14:12:01 -0700 |
commit | dbf3199e46d8a9c0ae37108f6afda35232ef4cdd (patch) | |
tree | 0dfda5cf87fdcd5ded534c9eb6f21bb44e4906f9 /lib/gallery.dialog.js | |
parent | 9d66783f47636153bf3661d1d89e694dd5188c36 (diff) |
Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers
that create the data to go into a dialog to return the html as part of a json object.
Diffstat (limited to 'lib/gallery.dialog.js')
-rw-r--r-- | lib/gallery.dialog.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index 6ec8c634..1e91e3ae 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -1,3 +1,4 @@ + (function($) { $.widget("ui.gallery_dialog", { _init: function() { @@ -26,8 +27,8 @@ $("#g-dialog").gallery_show_loading(); - $.get(sHref, function(data) { - $("#g-dialog").html(data).gallery_show_loading(); + $.getJSON(sHref, function(data) { + $("#g-dialog").html(unescape(data.form)).gallery_show_loading(); if ($("#g-dialog form").length) { self.form_loaded(null, $("#g-dialog form")); |