Mercurial > hg > digilib-old

changeset 901:1b627b5c9fad mvnify

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from jquery branch
author robcast
date Tue, 26 Apr 2011 10:44:10 +0200
parents 6c43597b0b08 (current diff) 76b01d51add4 (diff)
children 89ba3ffcf552
files client/src/main/webapp/jquery/jquery-test-embedded.html client/src/main/webapp/jquery/jquery.digilib.css client/src/main/webapp/jquery/jquery.digilib.js
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 {
--- 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,