Merge branch 'master' of git@github.com:gallery/gallery3

Conflicts:
	modules/gallery/libraries/Theme_View.php
	themes/admin_default/views/admin.html.php

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js
index b2895c23..8b271db9 100644
--- a/lib/gallery.show_full_size.js
+++ b/lib/gallery.show_full_size.js
@@ -26,10 +26,10 @@ var show_full_size = function(image_url, image_width, image_height) {
 
     // handle the case where the calculation is almost zero (2.14e-14)
     return {
-      top: ((windowHeight - imageHeight) / 2).toFixed(2),
-      left: ((windowWidth - imageWidth) / 2).toFixed(2),
-      width: imageWidth.toFixed(2),
-      height: imageHeight.toFixed(2)
+      top: Number((windowHeight - imageHeight) / 2),
+      left: Number((windowWidth - imageWidth) / 2),
+      width: Number(imageWidth),
+      height: Number(imageHeight)
     };
   }