Mercurial > hg > digilib

changeset 1560:2a23b922d37e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better transition to dimmed background; stay in the same fit mode when zooming
author hertzhaft
date Tue, 01 Nov 2016 19:03:46 +0100
parents 9cf6cfa086b7
children 2762b7bc56d1
files webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 1 files changed, 43 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Sat Oct 29 22:34:38 2016 +0200
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Tue Nov 01 19:03:46 2016 +0100
@@ -377,11 +377,9 @@
                 // interactively
                 var onComplete = function(data, rect) {
                     if (rect == null) return;
-                    // hide image
-                    fadeScalerImg(data, 0);
+                    // hide image, show dimmed background
+                    fadeScalerImg(data, 'fadeOut');
                     setZoomArea(data, rect);
-                    // reset modes
-                    setFitMode(data, 'both');
                     setScaleMode(data, 'screen');
                     redisplay(data);
                     };
@@ -398,11 +396,9 @@
          * @param mode
          */
         zoomFull : function (data, mode) {
+            setFitMode(data, mode);
+            data.$scaler.css('opacity', data.settings.scalerFadedOpacity);
             setZoomArea(data, FULL_AREA.copy());
-            // hide image
-            fadeScalerImg(data, 0);
-            setFitMode(data, mode);
-            // zoom full only works in screen mode
             setScaleMode(data, 'screen');
             redisplay(data);
         },
@@ -512,6 +508,8 @@
             var settings = data.settings;
             var paramNames = settings.digilibParamNames;
             var params = data.queryParams;
+            // dim image, show something is happening
+            data.$scaler.css('opacity', data.settings.scalerFadedOpacity);
             // delete all digilib parameters
             for (var i = 0; i < paramNames.length; i++) {
                 var paramName = paramNames[i];
@@ -1283,11 +1281,16 @@
             $scaler.css('cursor', 'auto');
             // adjust scaler div size (beware: setting position makes the element relative)
             imgRect.getSize().adjustDiv($scaler);
+            // initial load of scaler background (for preview)
+            if (!data.hasPreviewBg) {
+                setPreviewBg(data, data.zoomArea);
+            }
+            data.hasPreviewBg = false;
             // show image in case it was hidden (for example in zoomDrag)
-            fadeScalerImg(data, 1);
-            data.hasPreviewBg = false;
+            fadeScalerImg(data, 'fadeIn');
             // update display (render marks, etc.)
             updateDisplay(data);
+            console.debug("* load handler finished");
         };
     };
 
@@ -1330,11 +1333,11 @@
         newarea.y -= 0.5 * (newarea.height - area.height);
         newarea = FULL_AREA.fit(newarea);
         setZoomArea(data, newarea);
-        // hide image
-        fadeScalerImg(data, 0);
+        // hide image, show dimmed background
+        fadeScalerImg(data, 'fadeOut');
         // reset modes
         setScaleMode(data, 'screen');
-        setFitMode(data, 'both');
+        // setFitMode(data, 'both'); // ###?
         redisplay(data);
     };
 
@@ -1427,14 +1430,15 @@
                 'cursor' : 'move'
         };
         if (newZoomArea != null) {
-            // check if aspect ratio has changed
-            if (Math.abs(newZoomArea.getAspect() - data.zoomArea.getAspect()) > 0.001 ) {
-                var newRect = data.imgTrafo.transform(newZoomArea);
+            // check if aspect ratio has changed 
+            if (Math.abs(newZoomArea.getAspect() - data.zoomArea.getAspect()) > 0.001) {
+                var newRect = imgTrafo.transform(newZoomArea);
                 var newAspect = newRect.getAspect();
                 var newSize = data.maxImgSize.fitAspect(newAspect);
                 // set scaler to presumed new size
                 newSize.adjustDiv($scaler);
-                console.debug("adjusting aspect ratio for preview", data.maxImgSize, newSize);
+                console.debug("adjusting aspect ratio of preview:",
+                  data.maxImgSize.toString(), '=>', newSize.toString());
             }
             // get transform for new zoomArea (use 'screen' instead of data.scaleMode)
             imgTrafo = getImgTrafo($scaler, newZoomArea, data.settings.rot,
@@ -1465,8 +1469,8 @@
                 scalerCss[data.bgSizeName] += ', ' + Math.round(fullRect.width) + 'px ' + Math.round(fullRect.height) + 'px';
                 scalerCss['background-position'] += ', ' + Math.round(fullRect.x) + 'px '+ Math.round(fullRect.y) + 'px';
             }
-            // console.debug('setPreviewBg', scalerCss);
         }
+        console.debug('* setPreviewBg', scalerCss[data.bgSizeName], 'pos', scalerCss['background-position']);
         $scaler.css(scalerCss);
         data.hasPreviewBg = true;
     };
@@ -1492,8 +1496,8 @@
             $elem.find('.'+data.settings.cssPrefix+'overlay').hide(); // hide all overlays (marks/regions)
             startPos = geom.position(evt);
             delta = null;
-            // hide the scaler img, show background of div instead
-            fadeScalerImg(data, 0);
+            // hide image, show dimmed background
+            fadeScalerImg(data, 'hide');
             // set low res background immediately on mousedown
             setPreviewBg(data);
             $document.on("mousemove.dlZoomDrag", dragMove);
@@ -1523,7 +1527,7 @@
             if (delta == null || delta.distance() < 2) {
                 // no change, show image again
                 data.hasPreviewBg = false;
-                fadeScalerImg(data, 1);
+                fadeScalerImg(data, 'fadeIn');
                 // unhide marks etc.
                 updateDisplay(data);
                 return false; 
@@ -1586,14 +1590,25 @@
     var fadeScalerImg = function (data, show) {
         var $img = data.$img;
         var $scaler = data.$scaler;
-        if (show == null || show == 0) {
-          // $img.css('visibility', 'hidden');
-          $scaler.fadeTo('fast', data.settings.scalerFadedOpacity);
-          $img.fadeOut({queue: false});
+        if (show == null || show === 'hide') {
+          $scaler.css('opacity', data.settings.scalerFadedOpacity);
+          $img.fadeOut(function(){
+            console.debug("* img hide", $img.css('display'));
+            });
+        } else if (show === 'fadeOut') {
+          $scaler.fadeTo('fast', data.settings.scalerFadedOpacity, function() {
+            console.debug("* scaler fadeOut", $img.css('display'), $img.css('opacity'));
+            $img.fadeOut(function(){
+              console.debug("* img fadeOut", $img.css('display'));
+              });
+          });
         } else {
-          // $img.css('visibility', 'visible');
-          $img.fadeIn({queue: false});
-          $scaler.fadeTo('slow', 1);
+          $img.fadeIn(function(){
+              console.debug("* img fadeIn", $img.css('display'));
+              $scaler.fadeTo('slow', 1, function() {
+                  console.debug("* scaler fadeIn", $img.css('display'), $img.css('opacity'));
+              });
+          });
         }
     };