1 files changed, 20 insertions, 11 deletions

diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js
index 7e826c32..49dc620a 100644
--- a/lib/gallery.show_full_size.js
+++ b/lib/gallery.show_full_size.js
@@ -7,7 +7,7 @@
      var height = $(document).height();
      var size = $.gallery_get_viewport_size();
 
-     $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
+     $("body").append('<div id="g-fullsize-overlay" class="ui-dialog-overlay" ' +
 		      'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
 		      'position: absolute; top: 0px; left: 0px; ' +
 		      'width: ' + width + 'px; height: ' + height + 'px;' +
@@ -15,34 +15,43 @@
 		      '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
 		      '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
 
-     var image_size = $.gallery_auto_fit_window(image_width, image_height);
+     var image_size;
+     if (image_width >= size.width() - 6 || image_height >= size.height() - 6) {
+       image_size = $.gallery_auto_fit_window(image_width, image_height);
+     } else {
+       image_size = {
+         top: Number((height - image_height) / 2), left: Number((width - image_width) / 2),
+         width: Number(image_width),  height: Number(image_height)
+       };
+     }
+
 
-     $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
+     $("body").append('<div id="g-fullsize" class="ui-dialog ui-widget" ' +
 		      'style="overflow: hidden; display: block; ' +
 		      'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
 		      'outline-style: none; outline-width: 0px; ' +
 		      'height: ' + image_size.height + 'px; ' +
 		      'width: ' + image_size.width + 'px; ' +
 		      'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
-		      '<img id="gFullSizeImage" src="' + image_url + '"' +
+		      '<img id="g-fullsize-image" src="' + image_url + '"' +
 		      'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
 
      $().click(function() {
-       $("#gFullsizeOverlay*").remove();
-       $("#gFullsize").remove();
+       $("#g-fullsize-overlay*").remove();
+       $("#g-fullsize").remove();
      });
      $().bind("keypress", function() {
-       $("#gFullsizeOverlay*").remove();
-       $("#gFullsize").remove();
+       $("#g-fullsize-overlay*").remove();
+       $("#g-fullsize").remove();
      });
      $(window).resize(function() {
-       $("#gFullsizeOverlay").width($(document).width()).height($(document).height());
+       $("#g-fullsize-overlay").width($(document).width()).height($(document).height());
        image_size = $.gallery_auto_fit_window(image_width, image_height);
-       $("#gFullsize").height(image_size.height)
+       $("#g-fullsize").height(image_size.height)
 	 .width(image_size.width)
 	 .css("top", image_size.top)
 	 .css("left", image_size.left);
-       $("#gFullSizeImage").height(image_size.height).width(image_size.width);
+       $("#g-fullsize-image").height(image_size.height).width(image_size.width);
      });
    };
 })(jQuery);