# HG changeset patch
# User robcast
# Date 1352824532 -3600
# Node ID c1e7821d3c680a2eeefc5518653ba0a2aff1aaa5
# Parent  f523a1c8edaa1e3527ddc73d5a84d70c2058707e
fix bug in path of arrow-images and problem with nested options.

diff -r f523a1c8edaa -r c1e7821d3c68 webapp/src/main/webapp/jquery/jquery.digilib.arrows.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.arrows.js	Mon Nov 12 13:04:58 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.arrows.js	Tue Nov 13 17:35:32 2012 +0100
@@ -20,7 +20,7 @@
         'buttonSettings' : {
             'fullscreen' : {
                 // path to button images (must end with a slash)
-                'imagePath' : 'img/fullscreen/',
+                'imagePath' : 'img/fullscreen/32/',
                 'arrowSetSize' : 16,
                 'arrowSet' : [ "up", "down", "left", "right" ]
             },
diff -r f523a1c8edaa -r c1e7821d3c68 webapp/src/main/webapp/jquery/jquery.digilib.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Mon Nov 12 13:04:58 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Tue Nov 13 17:35:32 2012 +0100
@@ -127,7 +127,7 @@
             FULL_AREA  = geom.rectangle(0, 0, 1, 1);
 
             // settings for this digilib instance are merged from defaults and options
-            var settings = $.extend({}, defaults, options);
+            var settings = $.extend(true, {}, defaults, options);
             var isFullscreen = settings.interactionMode === 'fullscreen';
             var queryParams = {};
             if (isFullscreen) {