Mercurial > hg > digilib-old

changeset 662:6a03dbd30e4f jquery

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in birdview handling. put all buttons on screen for testing. make buttons scroll is larger than screen.
author robcast
date Sat, 22 Jan 2011 23:34:48 +0100
parents 68bf2f2953d0
children 9791a2cec863
files client/digitallibrary/jquery/jquery.digilib.js
diffstat 1 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/client/digitallibrary/jquery/jquery.digilib.js	Sat Jan 22 22:03:20 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.js	Sat Jan 22 23:34:48 2011 +0100
@@ -187,7 +187,7 @@
         'buttonsImagePath' : '../greyskin/', 
         // button groups
         //'buttonsStandard' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","bird","SEP","help","reset","options"],
-        'buttonsStandard' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","mark","delmark","hmir","vmir","back","fwd","page","bird","help","options"],
+        'buttonsStandard' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","mark","delmark","hmir","vmir","back","fwd","page","rot","brgt","cont","rgb","quality","size","calibrationx","scale","bird","help","options"],
         'buttonsSpecial' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","SEP","options"],
         'buttonsCustom' : [],
         // is birdView shown?
@@ -537,6 +537,8 @@
         // digilib option birdview
         if (settings.isBirdDivVisible) {
             data.dlOpts.birdview = 1;
+        } else {
+            delete data.dlOpts.birdview;
         }
         // digilib options
         if (data.dlOpts) {
@@ -551,14 +553,6 @@
         }
     };
 
-    // returns maximum size for scaler img in fullscreen mode
-    var getFullscreenImgSize = function($elem) {
-        var winH = $(window).height();
-        var winW = $(window).width();
-        // TODO: account for borders?
-        return geom.size(winW, winH);
-    };
-
     // (re)load the img from a new scaler URL
     var redisplay = function (data) {
         var settings = data.settings; 
@@ -577,6 +571,15 @@
         }
     };
 
+    // returns maximum size for scaler img in fullscreen mode
+    var getFullscreenImgSize = function($elem) {
+        var $win = $(window);
+        var winH = $win.height();
+        var winW = $win.width();
+        // TODO: account for borders?
+        return geom.size(winW, winH);
+    };
+
     // creates HTML structure for digilib in elem
     var setupScalerDiv = function (data) {
         var settings = data.settings;
@@ -663,6 +666,10 @@
                 $img.attr('src', settings.buttonsImagePath + buttonSettings.img);
             }
         }
+        // make buttons div scroll if too large for window
+        if ($buttonsDiv.height() > $(window).height() - 10) {
+            $buttonsDiv.css('position', 'absolute');
+        }
         return $buttonsDiv;
     };