Index: js/lightbox.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/lightbox2/js/lightbox.js,v
retrieving revision 1.5.2.6.4.105
diff -u -p -r1.5.2.6.4.105 lightbox.js
--- js/lightbox.js	5 Jan 2009 14:21:40 -0000	1.5.2.6.4.105
+++ js/lightbox.js	14 Jan 2009 18:43:44 -0000
@@ -920,17 +920,17 @@ var Lightbox = {
 
     var xScroll, yScroll;
 
+    if (window.innerHeight && window.scrollMaxY) {  
+      xScroll = window.innerWidth + window.scrollMaxX;
+      yScroll = window.innerHeight + window.scrollMaxY;
+    }
     // All but Explorer Mac.
-    if (document.body.scrollHeight > document.body.offsetHeight) {
+    else if (document.body.scrollHeight > document.body.offsetHeight) {
       xScroll = document.body.scrollWidth;
       yScroll = document.body.scrollHeight;
     }
-    else if (window.innerHeight && window.scrollMaxY) {
-      xScroll = window.innerWidth + window.scrollMaxX;
-      yScroll = window.innerHeight + window.scrollMaxY;
-    }
-    // Explorer Mac...would also work in Explorer 6 Strict, Mozilla and Safari.
     else {
+    // Explorer Mac...would also work in Explorer 6 Strict, Mozilla and Safari.
       xScroll = document.body.offsetWidth;
       yScroll = document.body.offsetHeight;
     }
@@ -964,13 +964,12 @@ var Lightbox = {
       pageHeight = yScroll;
     }
 
-
     // For small pages with total width less then width of the viewport.
     if (xScroll < windowWidth) {
-      pageWidth = windowWidth;
+      pageWidth = xScroll;
     }
     else {
-      pageWidth = xScroll;
+      pageWidth = windowWidth;
     }
 
     arrayPageSize = [pageWidth, pageHeight, windowWidth, windowHeight];