From 443e49b2ae88545f5a56842f2283f4f98dc7b65f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 24 Feb 2011 22:52:32 -0800
Subject: Revert overeager escaping introduced in
 https://github.com/gallery/gallery3/commit/bb35aefffbc287efc9823abd4b0e451b86c37378
 in an attempt to resolve #797.

Fixes #1640.
---
 lib/gallery.dialog.js | 4 ++--
 lib/gallery.panel.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

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;
                }
-- 
cgit v1.2.3


From 907377835bb34ca395dc5c6ab5a53f0fd2f6392b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 Mar 2011 17:05:29 -0800
Subject: When we're not auto-fitting the image, pin it to the top of the page.
 This way small images on pages with a ton of comments don't get pushed way
 down.  Fixes #1626.

---
 lib/gallery.show_full_size.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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)
-- 
cgit v1.2.3