# HG changeset patch
# User robcast
# Date 1331065940 -3600
# Node ID 4ee43243a6a0861e9d2442cd91c4a04b57b3c2c1
# Parent  8e3462a753f00bf28bd94f6e39cac0e8c4aad0fb
more clean up.
new hover-style for regions.
clicking on region to zoom uses zoomArea action.

diff -r 8e3462a753f0 -r 4ee43243a6a0 webapp/src/main/webapp/jquery/jquery.digilib.css
--- a/webapp/src/main/webapp/jquery/jquery.digilib.css	Tue Mar 06 17:58:14 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.css	Tue Mar 06 21:32:20 2012 +0100
@@ -58,22 +58,23 @@
 
 div.dl-digilib div.dl-region {
 	position: absolute;
+    color: white;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 11px;
 	background-color: red;
     opacity: 0.3;
+    /* do we still need this IE6-stuff? */
 	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); 
 }
 
 div.dl-digilib div.dl-region:hover {
-	opacity: 0.5;
+	background-color: transparent;
+	border: 2px solid red;
+	/* opacity: 0.5; */
+    /* do we still need this IE6-stuff? */
 	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50); 
 }
 
-div.dl-digilib div.dl-region {
-    color: white;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 11px;
-}
-
 div.dl-digilib div.dl-region a.dl-regionnumber {
     color: white;
     text-decoration: none;
diff -r 8e3462a753f0 -r 4ee43243a6a0 webapp/src/main/webapp/jquery/jquery.digilib.regions.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.regions.js	Tue Mar 06 17:58:14 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.regions.js	Tue Mar 06 21:32:20 2012 +0100
@@ -21,8 +21,6 @@
     // affine geometry plugin
     var geom = null;
 
-    var ID_PREFIX = "digilib-region-";
-
     var buttons = {
         addregion : {
             onclick : "defineRegion",
@@ -270,24 +268,29 @@
     var addRegionDiv = function (data, index, attributes) {
         var cssPrefix = data.settings.cssPrefix;
         var nr = index + 1; // we count regions from 1
-        // create a digilib URL for this detail
-        var url = attributes ? attributes.href : getRegionUrl(data, index);
         var $regionDiv = $('<div class="'+cssPrefix+'region '+cssPrefix+'overlay" style="display:none"/>');
-        $regionDiv.attr("id", ID_PREFIX + nr);
         data.$elem.append($regionDiv);
         if (data.settings.showRegionNumbers) {
-            var $regionLink = $('<a class="'+cssPrefix+'regionnumber"/>');
+            var $regionLink = $('<a class="'+cssPrefix+'regionnumber">'+nr+'</a>');
             if (attributes) $regionLink.attr(attributes);
-            $regionLink.text(nr);
             $regionDiv.append($regionLink);
         }
         if (data.settings.autoRegionLinks) {
+            var url = null;
             if (attributes) {
+                if (attributes.href != null) {
+                    url = attributes.href;
+                }
                 delete attributes.href;
                 $regionDiv.attr(attributes);
             }
+            var region = data.regions[index];
             $regionDiv.on('click.dlRegion', function() {
-                 window.location = url;
+                if (url != null) {
+                    window.location = url;
+                } else {
+                    digilib.actions['zoomArea'](data, region);
+                }
             });
         }
         return $regionDiv;
@@ -324,11 +327,11 @@
             var pos = coords.split(",", 4);
             var rect = geom.rectangle(pos[0], pos[1], pos[2], pos[3]);
             regions.push(rect);
-            // save the attributes
+            // copy some attributes
             var attributes = {};
-            if ($a.attr('id')) { attributes.id = $a.attr('id'); }
-            if ($a.attr('href')) { attributes.href = $a.attr('href'); }
-            if ($a.attr('title')) { attributes.title = $a.attr('title'); }
+            for (var n in {'id':1, 'href':1, 'title':1, 'target':1, 'style':1}) {
+                attributes[n] = $a.attr(n);
+            }
             // create the div
             var $regionDiv = createRegionDiv(data, regions, index, attributes);
             var $contents = $a.contents().clone();
@@ -361,7 +364,7 @@
             } else{
                 $regionDiv.show();
             }
-            // for some reason adjustDiv sets wrong coords when called BEFORE show()?
+            // adjustDiv sets wrong coords when called BEFORE show()
             screenRect.adjustDiv($regionDiv);
         } else {
             if (anim) {
@@ -402,7 +405,7 @@
         }
         var rg = '';
         for (var i = 0; i < regions.length; i++) {
-            region = regions[i];
+            var region = regions[i];
             if (i) {
                 rg += ',';
             }
@@ -424,23 +427,6 @@
         fn.redisplay(data);
     };
 
-    // for turning region numbers/region divs into links to zoomed details 
-    var getRegionUrl = function (data, index) {
-        var region = data.regions[index];
-        var settings = data.settings;
-        var params = {
-            "fn" : settings.fn,
-            "pn" : settings.pn
-            };
-        fn.packArea(params, region);
-        fn.packMarks(params, data.marks);
-        fn.packScalerFlags(params, data.scalerFlags);
-        var paramNames = digilib.defaults.digilibParamNames;
-        // build our own digilib URL without storing anything
-        var queryString = fn.getParamString(params, paramNames, digilib.defaults);
-        return settings.digilibBaseUrl + '?' + queryString;
-    };
-
     // event handler, reads region parameter and creates region divs
     var handleSetup = function (evt) {
         var data = this;
@@ -494,8 +480,6 @@
         $data.on('setup', handleSetup);
         $data.on('update', handleUpdate);
         var settings = data.settings;
-        var selector = settings.regionContentSelector;
-        //settings.hasRegionContent = $elem.has(selector).length > 0;
         // neither URL-defined regions nor buttons when regions are predefined in HTML
         if (!settings.hasRegionContent) {
             var mode = settings.interactionMode;