# HG changeset patch
# User robcast
# Date 1296407467 -3600
# Node ID 5bf8958edb9bb0fb7dfc171eb05d046da35637be
# Parent  498f9c7487ae2c82f57ca1699293bf4708105e4d# Parent  e740c0b865083c3d29e5f77bb780d1a871ab19e7
merge
with 823f0050f7eb3e568cf55042b7d5958eecb8854e

diff -r 498f9c7487ae -r 5bf8958edb9b client/digitallibrary/jquery/jquery-test-full.html
--- a/client/digitallibrary/jquery/jquery-test-full.html	Sun Jan 30 17:58:56 2011 +0100
+++ b/client/digitallibrary/jquery/jquery-test-full.html	Sun Jan 30 18:11:07 2011 +0100
@@ -17,7 +17,8 @@
                 right: 5px;
                 top: 5px;
                 padding: 3px;
-                background-color: silver;
+                background-color: transparent;
+                z-index: 20;
             }
 
             img.button:hover {
@@ -42,7 +43,7 @@
               position: absolute;
               /* border: 2px solid #ffa060; */
               border: 2px solid #ff0000;
-              z-index: 200;
+              z-index: 100;
               }
 
             div.birdview {
@@ -71,6 +72,7 @@
                 
             div.bgDrag {
                 background-color: grey;
+                z-index: 0;
                 }
 
         </style>
diff -r 498f9c7487ae -r 5bf8958edb9b client/digitallibrary/jquery/jquery.digilib.js
--- a/client/digitallibrary/jquery/jquery.digilib.js	Sun Jan 30 17:58:56 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.js	Sun Jan 30 18:11:07 2011 +0100
@@ -508,6 +508,8 @@
             // TODO: should we really reset all user preferences here?
             settings.isBirdDivVisible = false;
             settings.visibleButtonSets = 1;
+            delete data.dlOpts.fitwidth;
+            delete data.dlOpts.fitheight;
             redisplay(data);
         },
 
@@ -797,10 +799,10 @@
         if (settings.interactionMode === 'fullscreen') {
             var imgSize = getFullscreenImgSize($elem);
             // fitwidth/height omits destination height/width
-            if (data.dlOpts.fitheight == null) {
+            if (data.dlOpts.fitheight !== '1') {
                 settings.dw = imgSize.width;
             }
-            if (data.dlOpts.fitwidth == null) {
+            if (data.dlOpts.fitwidth !== '1') {
                 settings.dh = imgSize.height;
             }
             $img = $('<img/>');