# HG changeset patch # User robcast # Date 1325633499 -3600 # Node ID e3dc84cbb7664946a3ba3d657c166efa950b68b7 # Parent 9c699b6cfcca2f17b85578382e90027b9a91df15 disable forced load event causing problem with firefox. fix problem with birds eye view. diff -r 9c699b6cfcca -r e3dc84cbb766 webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js Tue Jan 03 21:44:22 2012 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js Wed Jan 04 00:31:39 2012 +0100 @@ -183,7 +183,7 @@ // show zoom area indicator on bird's eye view var renderBirdArea = function (data) { - if (data.$birdImg == null || ! data.$birdImg.get(0).complete) return; + if (data.$birdImg == null || ! data.$birdImg.prop('complete') || data.birdTrafo == null) return; var $birdZoom = data.$birdZoom; var zoomArea = data.zoomArea; var normalSize = digilib.fn.isFullArea(zoomArea); diff -r 9c699b6cfcca -r e3dc84cbb766 webapp/src/main/webapp/jquery/jquery.digilib.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.js Tue Jan 03 21:44:22 2012 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Wed Jan 04 00:31:39 2012 +0100 @@ -768,8 +768,8 @@ var $img = data.$img; var imgurl = getScalerUrl(data); $img.attr('src', imgurl); - // trigger load event if image is cached - if ($img.prop('complete')) $img.trigger('load'); + // trigger load event if image is cached. Doesn't work with Firefox!! + //if ($img.prop('complete')) $img.trigger('load'); if (data.scalerFlags.clip != null || data.scalerFlags.osize != null) { // we need image info, do we have it? if (data.imgInfo == null) { @@ -1156,7 +1156,7 @@ imgRect.adjustDiv($scaler); // show image in case it was hidden (for example in zoomDrag) $img.css('visibility', 'visible'); - $scaler.css({'opacity' : '1', 'background-image' : 'none'}); + $scaler.css({'opacity' : '1', 'background' : 'transparent'}); data.hasPreviewBg = false; // update display (render marks, etc.) updateDisplay(data);