# HG changeset patch
# User hertzhaft
# Date 1327504619 -3600
# Node ID 548988d9fad54bfd7653fd405762584392023716
# Parent e9e50df87c9adfdcf3ace1381acf3bb949033015# Parent 6d5f0c39a37fc65fe261ba11ada5e951586e5f66
merge (sorry, with digilib-config.xml)
diff -r 6d5f0c39a37f -r 548988d9fad5 webapp/src/main/webapp/WEB-INF/digilib-config.xml
--- a/webapp/src/main/webapp/WEB-INF/digilib-config.xml Wed Jan 25 15:23:06 2012 +0100
+++ b/webapp/src/main/webapp/WEB-INF/digilib-config.xml Wed Jan 25 16:16:59 2012 +0100
@@ -14,7 +14,7 @@
-
+
diff -r 6d5f0c39a37f -r 548988d9fad5 webapp/src/main/webapp/jquery/jquery.digilib.buttons.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js Wed Jan 25 15:23:06 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js Wed Jan 25 16:16:59 2012 +0100
@@ -187,7 +187,7 @@
}
},
// number of visible button groups
- 'visibleButtonSets' : 1,
+ 'visibleButtonSets' : 1
};
var actions = {
diff -r 6d5f0c39a37f -r 548988d9fad5 webapp/src/main/webapp/jquery/jquery.digilib.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js Wed Jan 25 15:23:06 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Wed Jan 25 16:16:59 2012 +0100
@@ -243,6 +243,8 @@
setupScalerDiv(data);
// about window creation - TODO: could be deferred? restrict to only one item?
setupAboutDiv(data);
+ // scale mode menu creation - TODO: could be deferred?
+ setupScaleModeDiv(data);
// arrow overlays for moving zoomed detail
setupZoomArrows(data);
// send setup event
@@ -553,7 +555,6 @@
redisplay(data);
}
}
-
// end of actions
};
@@ -1155,6 +1156,27 @@
});
};
+ /** creates HTML structure for the scale mode menu
+ *
+ */
+ var setupScaleModeDiv = function (data) {
+ var $elem = data.$elem;
+ var settings = data.settings;
+ var $scaleModeDiv = $('
');
+ var $scaleModeSelect = $('');
+ var $scaleModeOptScreen = $('');
+ var $scaleModeOptPixel = $('');
+ var $scaleModeOptOrig = $('');
+ $elem.append($scaleModeDiv);
+ $scaleModeDiv.append($scaleModeSelect);
+ $scaleModeSelect.append($scaleModeOptScreen);
+ $scaleModeSelect.append($scaleModeOptPixel);
+ $scaleModeSelect.append($scaleModeOptOrig);
+ $scaleModeSelect.on('change.digilib', function () {
+ actions['setScaleMode'](data, false);
+ });
+ };
+
/** shows some window e.g. 'about' (toggle visibility if show is null)
*
*/