# HG changeset patch
# User robcast
# Date 1325069238 -3600
# Node ID 79cbc4694b14ccbe4c746e7485558e62fcf967c3
# Parent  2b136cdbc6b2edd8c35421063340acd166c91117# Parent  6b49f78ccfd88eb0bb576a26e6e1e9e8aa6ebfb0
Merge with 6b49f78ccfd88eb0bb576a26e6e1e9e8aa6ebfb0

diff -r 2b136cdbc6b2 -r 79cbc4694b14 webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js	Wed Dec 28 11:44:28 2011 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js	Wed Dec 28 11:47:18 2011 +0100
@@ -234,7 +234,7 @@
             scalerPos = geom.position($scaler);
             newRect = null;
             data.$elem.find(".overlay").hide(); // hide all overlays (marks/regions)
-            fullRect = digilib.fn.setZoomBG(data); // setup zoom background image
+            fullRect = digilib.fn.setZoomBg(data); // setup zoom background image
             $document.on("mousemove.dlBirdMove", birdZoomMove);
             $document.on("mouseup.dlBirdMove", birdZoomEndDrag);
             return false;
diff -r 2b136cdbc6b2 -r 79cbc4694b14 webapp/src/main/webapp/jquery/jquery.digilib.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Dec 28 11:44:28 2011 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Dec 28 11:47:18 2011 +0100
@@ -254,7 +254,7 @@
                 'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","scale","lessoptions"],
                 'arrowSet' : ["up", "down", "left", "right"],
                 'buttonSets' : ['standardSet', 'specialSet']
-                },
+                }
         },
         // arrow bar overlays for moving the zoomed area
         'showZoomArrows' : true,