Mercurial > hg > digilib-old

changeset 986:91534bc0c15b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix reset method
author hertzhaft
date Sun, 29 Jan 2012 17:26:14 +0100
parents 7f93dc476cdf
children f58a6ed1464b
files webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Jan 27 16:00:50 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Sun Jan 29 17:26:14 2012 +0100
@@ -442,8 +442,9 @@
                 }
             settings.fn = params.fn || ''; // no default defined
             settings.pn = params.pn || defaults.pn;
-            settings.dw = params.dw;
-            settings.dh = params.dh;
+            var size = getFullscreenImgSize(data);
+            settings.dw = params.dw || size.width;
+            settings.dh = params.dh || size.height;
             settings.isBirdDivVisible = false;
             settings.visibleButtonSets = 1; // FIXME
             // resets zoomArea, marks, scalerflags
@@ -452,6 +453,7 @@
             data.scalerFlags = {};
             delete data.dlOpts.fitwidth;
             delete data.dlOpts.fitheight;
+            data.scaleMode = 'screen';
             redisplay(data);
         },
 
@@ -913,7 +915,6 @@
      * returns maximum size for scaler img in fullscreen mode.
      */
     var getFullscreenImgSize = function (data) {
-        var mode = data.settings.interactionMode;
         var $win = $(window);
         var winH = $win.height();
         var winW = $win.width();