summaryrefslogtreecommitdiff
path: root/lib/gallery.panel.js
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-08-01 08:31:09 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-08-01 08:31:09 -0700
commita4531707274318496bb7a4477d940030d870f133 (patch)
tree6715be3db83d7f834676a0b2c7a38c9bd58ce1a5 /lib/gallery.panel.js
parentfc580037e797fad48b49fcffa7aa69dca8761972 (diff)
parent7607e1f932dda53144792d0b7e8674a34fbc7f9a (diff)
Merge branch 'dialog' of github.com:gallery/gallery3 into dialog
Diffstat (limited to 'lib/gallery.panel.js')
-rw-r--r--lib/gallery.panel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index aee7185d..e0605ca3 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.form);
+ content = unescape(data.html);
} else {
content = data;
}
@@ -79,8 +79,8 @@
return true;
},
success: function(data) {
- if (data.form) {
- $("#g-panel td").html(data.form);
+ if (data.html) {
+ $("#g-panel td").html(data.html);
self._ajaxify_panel();
}
if (data.result == "success") {