diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
| commit | 1f7c1f18c651c58048e92d615c71ac0fe6691c10 (patch) | |
| tree | 4527c4bc08000a07c180cd1fe81792d71195d58b /lib | |
| parent | de6f3fce9110b777d61dec97f2a3a61d887a5ccd (diff) | |
| parent | 55da59c942c0f7171b515f0718fea8506ed4b116 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gallery.dialog.js | 4 | ||||
| -rw-r--r-- | lib/gallery.panel.js | 2 | ||||
| -rw-r--r-- | lib/gallery.show_full_size.js | 2 |
3 files changed, 4 insertions, 4 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; } diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js index 531d2a3a..0baee882 100644 --- a/lib/gallery.show_full_size.js +++ b/lib/gallery.show_full_size.js @@ -20,7 +20,7 @@ image_size = $.gallery_auto_fit_window(image_width, image_height); } else { image_size = { - top: Math.round((height - image_height) / 2), + top: 12, left: Math.round((width - image_width) / 2), width: Math.round(image_width), height: Math.round(image_height) |