From 67504a00ebf918274d23f316e076112166989938 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Mon, 11 Mar 2013 15:49:27 +0100 Subject: #2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor. - fixed for new jQuery. - removed unnecessary CSS. - fixed bug where small images would get oversized when the window was resized. - refactored a few other things. --- lib/gallery.show_full_size.js | 75 +++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 49 deletions(-) (limited to 'lib') diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js index 0baee882..367fa808 100644 --- a/lib/gallery.show_full_size.js +++ b/lib/gallery.show_full_size.js @@ -1,58 +1,35 @@ (function($) { - /** - * @todo Move inline CSS out to external style sheet (theme style sheet) - */ $.gallery_show_full_size = function(image_url, image_width, image_height) { - var width = $(document).width(); - var height = $(document).height(); - var size = $.gallery_get_viewport_size(); - - $("body").append('
'); - - 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: 12, - left: Math.round((width - image_width) / 2), - width: Math.round(image_width), - height: Math.round(image_height) - }; - } - - $("body").append('
' + - '
'); + $("body").append('
' + + '
' + + '' + + '
'); - $().click(function() { - $("#g-fullsize-overlay*").remove(); - $("#g-fullsize").remove(); - }); - $().bind("keypress", function() { + $(document).on("click keypress", function() { $("#g-fullsize-overlay*").remove(); $("#g-fullsize").remove(); }); - $(window).resize(function() { - $("#g-fullsize-overlay").width($(document).width()).height($(document).height()); - image_size = $.gallery_auto_fit_window(image_width, image_height); - $("#g-fullsize").height(image_size.height) - .width(image_size.width) - .css("top", image_size.top) - .css("left", image_size.left); + + var size = $.gallery_get_viewport_size(); + var image_size; + + function update_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: 12, + left: Math.round((size.width() - image_width) / 2), + width: Math.round(image_width), + height: Math.round(image_height) + }; + } + $("#g-fullsize").height(image_size.height).width(image_size.width) + .css("top", image_size.top).css("left", image_size.left); $("#g-fullsize-image").height(image_size.height).width(image_size.width); - }); + } + + $(document).ready(update_image_size); + $(window).resize(update_image_size); }; })(jQuery); -- cgit v1.2.3