# HG changeset patch
# User hertzhaft
# Date 1299412689 -3600
# Node ID c662bf3358817a29cccc8df792a0f38e58467989
# Parent  dad6a171bc52ae5ec747581d10b22804bee87bce
fixed a bug in geom.intersect

diff -r dad6a171bc52 -r c662bf335881 client/digitallibrary/jquery/jquery-test-embedded.html
--- a/client/digitallibrary/jquery/jquery-test-embedded.html	Sat Mar 05 00:16:04 2011 +0100
+++ b/client/digitallibrary/jquery/jquery-test-embedded.html	Sun Mar 06 12:58:09 2011 +0100
@@ -64,7 +64,7 @@
         <script type="text/javascript">
             $(document).ready(function(){
                 var opts = {
-                    interactionMode : 'fullscreen',
+                    interactionMode : 'embedded',
                     scalerBaseUrl : 'http://digilib.biblhertz.it/digilib04/servlet/Scaler',
                     showRegionNumbers : true,
                     autoRegionLinks : false,
diff -r dad6a171bc52 -r c662bf335881 client/digitallibrary/jquery/jquery.digilib.geometry.js
--- a/client/digitallibrary/jquery/jquery.digilib.geometry.js	Sat Mar 05 00:16:04 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.geometry.js	Sun Mar 06 12:58:09 2011 +0100
@@ -262,24 +262,25 @@
         };
         // returns the intersection of rectangle "rect" and this one
         that.intersect = function(rect) {
-            var res = rect.clipTo(this);
-            if (res.width < 0 || res.height < 0) res = null;
-            return res;
+            var r = rect.copy();
+            var result = r.clipTo(this);
+            if (result.width < 0 || result.height < 0) result = null;
+            return result;
         };
 
         // returns a copy of rectangle "rect" that fits into this one
         // (moving it first)
         that.fit = function(rect) {
-            var sec = rect.copy();
-            sec.x = Math.max(sec.x, this.x);
-            sec.y = Math.max(sec.y, this.x);
-            if (sec.x + sec.width > this.x + this.width) {
-                sec.x = this.x + this.width - sec.width;
+            var r = rect.copy();
+            r.x = Math.max(r.x, this.x);
+            r.y = Math.max(r.y, this.x);
+            if (r.x + r.width > this.x + this.width) {
+                r.x = this.x + this.width - r.width;
             }
-            if (sec.y + sec.height > this.y + this.height) {
-                sec.y = this.y + this.height - sec.height;
+            if (r.y + r.height > this.y + this.height) {
+                r.y = this.y + this.height - r.height;
             }
-            return sec.intersect(this);
+            return r.intersect(this);
         };
         // adjusts position and size of jQuery element "$elem" to this rectangle
         that.adjustDiv = function($elem) {