Mercurial > hg > digilib-old
diff client/src/main/webapp/jquery/jquery.digilib.js @ 901:1b627b5c9fad mvnify
merge from jquery branch
author | robcast |
---|---|
date | Tue, 26 Apr 2011 10:44:10 +0200 |
parents | client/digitallibrary/jquery/jquery.digilib.js@01b875d668b1 client/digitallibrary/jquery/jquery.digilib.js@ba1eb2d821a2 |
children |
line wrap: on
line diff
--- 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,