# HG changeset patch # User robcast # Date 1303807450 -7200 # Node ID ec077cb6a8dc0a6ac1c401688473f84135fdebbb # Parent 6116386734fd133e20b5dbf59905a95a844eb9f7# Parent 96763f8467e51914a2618451a2431d70d678c706 merge from jquery branch diff -r 6116386734fd -r ec077cb6a8dc client/src/main/webapp/jquery/jquery-test-embedded.html diff -r 6116386734fd -r ec077cb6a8dc client/src/main/webapp/jquery/jquery.digilib.css --- a/client/src/main/webapp/jquery/jquery.digilib.css Thu Apr 21 10:58:31 2011 +0200 +++ b/client/src/main/webapp/jquery/jquery.digilib.css Tue Apr 26 10:44:10 2011 +0200 @@ -59,11 +59,13 @@ div.digilib div.region { position: absolute; background-color: red; - opacity: 0.3; + opacity: 0.3; + filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); } div.digilib div.region:hover { opacity: 0.5; + filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50); } div.digilib div.region { diff -r 6116386734fd -r ec077cb6a8dc client/src/main/webapp/jquery/jquery.digilib.js --- a/client/src/main/webapp/jquery/jquery.digilib.js Thu Apr 21 10:58:31 2011 +0200 +++ b/client/src/main/webapp/jquery/jquery.digilib.js Tue Apr 26 10:44:10 2011 +0200 @@ -1378,7 +1378,13 @@ // update scaler image transform var updateImgTrafo = function (data) { var $img = data.$img; - if ($img != null && $img.get(0).complete) { + if ($img == null) + return; + var image = $img.get(0); + var imgLoaded = $.browser.msie + ? image.width > 0 + : image.complete; + if (imgLoaded) { // create Transform from current zoomArea and image size data.imgTrafo = getImgTrafo($img, data.zoomArea, data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir,