Index: lams_tool_images/web/includes/javascript/thickbox.js =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/includes/javascript/thickbox.js,v diff -u -r1.4 -r1.5 --- lams_tool_images/web/includes/javascript/thickbox.js 30 Nov 2008 15:02:59 -0000 1.4 +++ lams_tool_images/web/includes/javascript/thickbox.js 10 Dec 2008 14:53:03 -0000 1.5 @@ -108,8 +108,10 @@ var pagesize = tb_getPageSize(); var x = pagesize[0] - 150; var y = pagesize[1] - 150; - var imageWidth = imgPreloader.width; - var imageHeight = imgPreloader.height; + var imageWidth = (jQuery.browser.msie) ? parseInt(params['dbWidth']) : imgPreloader.width; + var initialImageWidth = imageWidth; + var imageHeight = (jQuery.browser.msie) ? parseInt(params['dbHeight']) : imgPreloader.height; + var initialImageHeight = imageHeight; if (imageWidth > x) { imageHeight = imageHeight * (x / imageWidth); imageWidth = x; @@ -130,12 +132,10 @@ TB_WIDTH = imageWidth + 30; TB_HEIGHT = imageHeight + 60; - alert(imgPreloader.width); - alert(imgPreloader.height); - if ((imgPreloader.width > x) ||(imgPreloader.height > y)) { + if ((initialImageWidth > x) ||(initialImageHeight > y)) { $("#TB_window").append("" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); } else { - $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); + $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); } $("#TB_closeWindowButton").click(tb_remove); @@ -293,7 +293,7 @@ } function tb_position() { -$("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); + $("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6 $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); }