Mercurial > hg > digilib-old

changeset 1131:c1e7821d3c68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in path of arrow-images and problem with nested options.
author robcast
date Tue, 13 Nov 2012 17:35:32 +0100
parents f523a1c8edaa
children d47513632da5
files webapp/src/main/webapp/jquery/jquery.digilib.arrows.js webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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" ]
             },
--- 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) {