Mercurial > hg > digilib-old

changeset 895:01b875d668b1 jquery

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
another ugly workaround for IE7
author hertzhaft
date Wed, 20 Apr 2011 09:05:36 +0200
parents 6584af320296
children 76b01d51add4
files client/digitallibrary/jquery/jquery-test-embedded.html client/digitallibrary/jquery/jquery.digilib.css client/digitallibrary/jquery/jquery.digilib.js
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/client/digitallibrary/jquery/jquery-test-embedded.html	Thu Apr 07 10:23:35 2011 +0200
+++ b/client/digitallibrary/jquery/jquery-test-embedded.html	Wed Apr 20 09:05:36 2011 +0200
@@ -51,7 +51,7 @@
 
         </style>
 
-        <script type="text/javascript" src="jquery-1.5.1.js"></script>
+        <script type="text/javascript" src="jquery-1.4.4.js"></script>
         <script type="text/javascript" src="jquery.cookie.js"></script>
         <script type="text/javascript" src="jquery.digilib.js"></script>
         <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
--- a/client/digitallibrary/jquery/jquery.digilib.css	Thu Apr 07 10:23:35 2011 +0200
+++ b/client/digitallibrary/jquery/jquery.digilib.css	Wed Apr 20 09:05:36 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/digitallibrary/jquery/jquery.digilib.js	Thu Apr 07 10:23:35 2011 +0200
+++ b/client/digitallibrary/jquery/jquery.digilib.js	Wed Apr 20 09:05:36 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,