Mercurial > hg > digilib

changeset 1473:ec3c18079511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add class to scaler when defining zoom area; commented out invalid css:background-image in zoom area overlay
author hertzhaft
date Sat, 09 Jan 2016 21:32:29 +0100
parents 56d69da93849
children 6f73aa2f9d11
files webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js webapp/src/main/webapp/jquery/jquery.digilib.css webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 3 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js	Thu Jan 07 00:26:58 2016 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js	Sat Jan 09 21:32:29 2016 +0100
@@ -2,7 +2,7 @@
  * #%L
  * digilib bird's eye view plugin
  * %%
- * Copyright (C) 2011 - 2013 Bibliotheca Hertziana, MPIWG Berlin
+ * Copyright (C) 2011 - 2016 Bibliotheca Hertziana, MPIWG Berlin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as 
@@ -115,12 +115,8 @@
     };
 
     var handleUpdate = function (evt) {
-        console.debug("birdseye: handleUpdate");
-        var data = this;
-        // if (data.settings.isBirdDivVisible) {
-        //    renderBirdArea(data);
-        //    setupBirdDrag(data);
-        // }
+        // console.debug("birdseye: handleUpdate");
+        // var data = this;
     };
 
     var handleRedisplay = function (evt) {
@@ -144,8 +140,8 @@
     var getBirdImgUrl = function (data) {
         var settings = data.settings;
         var birdDivOptions = {
-                dw : settings.birdDivWidth,
-                dh : settings.birdDivHeight
+            dw : settings.birdDivWidth,
+            dh : settings.birdDivHeight
         };
         var birdSettings = $.extend({}, settings, birdDivOptions);
         // use only the relevant parameters
@@ -207,11 +203,6 @@
             data.birdTrafo = digilib.fn.getImgTrafo(data.$birdImg, FULL_AREA);
             // update display (zoom area indicator)
             if (data.settings.isBirdDivVisible) {
-                //if (birdRect.width === 0) {
-                    // workaround: IE7 calls load handler when there is no size info yet 
-                //    setTimeout(function () { $birdImg.triggerHandler('load'); }, 200);
-                //    return;
-                //    }
                 renderBirdArea(data);
                 }
         };
--- a/webapp/src/main/webapp/jquery/jquery.digilib.css	Thu Jan 07 00:26:58 2016 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.css	Sat Jan 09 21:32:29 2016 +0100
@@ -36,7 +36,7 @@
 div.dl-digilib div.dl-areaoverlay {
 	position: absolute;
 	z-index: 100;
-	background-image:url('.');
+	/* background-image:url('.'); */
 }
 
 div.dl-digilib div.dl-birdview {
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Thu Jan 07 00:26:58 2016 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Sat Jan 09 21:32:29 2016 +0100
@@ -45,7 +45,7 @@
 
     var defaults = {
         // version of this script
-        'version' : 'jquery.digilib.js 2.3.7c',
+        'version' : 'jquery.digilib.js 2.3.7d',
         // logo url
         'logoUrl' : 'img/digilib-logo-text1.png',
         // homepage url (behind logo)
@@ -363,6 +363,8 @@
          */
         zoomArea : function (data, area) {
             if (area == null) {
+                // already defining area
+                if ($('#'+data.settings.cssPrefix+'areaoverlay').length > 0) return;
                 // interactively
                 var onComplete = function(data, rect) {
                     if (rect == null) return;
@@ -1320,7 +1322,7 @@
         var bodyRect = geom.rectangle($body);
         var pt1, pt2;
         // overlay div prevents other elements from reacting to mouse events 
-        var $overlayDiv = $('<div class="'+CSS+'areaoverlay"/>');
+        var $overlayDiv = $('<div id="'+CSS+'areaoverlay" class="'+CSS+'areaoverlay"/>');
         $elem.append($overlayDiv);
         bodyRect.adjustDiv($overlayDiv);
         // area div 
@@ -1329,6 +1331,7 @@
             $areaDiv.addClass(cls); // individual styling
         }
         $elem.append($areaDiv);
+        $scaler.addClass(CSS+'definearea');
 
         var areaStart = function (evt) {
             pt1 = geom.position(evt);
@@ -1364,6 +1367,7 @@
             // unregister events
             $overlayDiv.off("mousemove.dlArea", areaMove);
             $overlayDiv.off("mouseup.dlArea", areaEnd);
+            $scaler.removeClass(CSS+'definearea');
             // clip and transform
             clickRect.clipTo(picRect);
             var rect = data.imgTrafo.invtransform(clickRect);