diff --git a/build.properties b/build.properties
index 33a72f19..0bdaf99a 100644
--- a/build.properties
+++ b/build.properties
@@ -6,7 +6,7 @@
PROJECT: openseadragon
BUILD_MAJOR: 0
BUILD_MINOR: 9
-BUILD_ID: 72
+BUILD_ID: 74
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
diff --git a/build.xml b/build.xml
index c2742117..265f9fb6 100644
--- a/build.xml
+++ b/build.xml
@@ -71,6 +71,8 @@
+
+
diff --git a/openseadragon.js b/openseadragon.js
index c3081437..c2add77b 100644
--- a/openseadragon.js
+++ b/openseadragon.js
@@ -1,5 +1,5 @@
/**
- * @version OpenSeadragon 0.9.72
+ * @version OpenSeadragon 0.9.74
*
* @fileOverview
*
@@ -495,7 +495,7 @@ OpenSeadragon = window.OpenSeadragon || function( options ){
navigatorHeight: null,
navigatorWidth: null,
navigatorPosition: null,
- navigatorSizeRatio: 0.25,
+ navigatorSizeRatio: 0.2,
preserveViewport: false,
defaultZoomLevel: 0,
@@ -505,7 +505,7 @@ OpenSeadragon = window.OpenSeadragon || function( options ){
referenceStripHeight: null,
referenceStripWidth: null,
referenceStripPosition: 'BOTTOM_LEFT',
- referenceStripSizeRatio: 0.25,
+ referenceStripSizeRatio: 0.2,
//COLLECTION VISUALIZATION SETTINGS
collectionRows: 3,
@@ -4686,10 +4686,7 @@ $.Navigator = function( options ){
showSequenceControl: false
});
- options.minPixelRatio = Math.min(
- options.navigatorSizeRatio * $.DEFAULT_SETTINGS.minPixelRatio,
- $.DEFAULT_SETTINGS.minPixelRatio
- );
+ options.minPixelRatio = this.minPixelRatio = viewer.minPixelRatio;
(function( style ){
style.marginTop = '0px';
@@ -6808,11 +6805,7 @@ $.ReferenceStrip = function( options ){
"animating": false
};
- minPixelRatio = Math.min(
- options.sizeRatio * $.DEFAULT_SETTINGS.minPixelRatio,
- $.DEFAULT_SETTINGS.minPixelRatio
- );
- this.minPixelRatio = minPixelRatio;
+ this.minPixelRatio = this.viewer.minPixelRatio;
(function( style ){
style.marginTop = '0px';
@@ -6823,10 +6816,11 @@ $.ReferenceStrip = function( options ){
style.bottom = '0px';
style.border = '1px solid #555';
style.background = '#000';
- //style.opacity = 0.8;
style.position = 'relative';
}( this.element.style ));
+ $.setElementOpacity( this.element, 0.8 );
+
this.viewer = viewer;
this.innerTracker = new $.MouseTracker({
element: this.element,
@@ -6895,13 +6889,13 @@ $.ReferenceStrip = function( options ){
element.id = this.element.id + "-" + i;
(function(style){
- style.width = this.panelWidth + 'px';
- style.height = this.panelHeight + 'px';
+ style.width = _this.panelWidth + 'px';
+ style.height = _this.panelHeight + 'px';
style.display = 'inline';
style.float = 'left'; //Webkit
style.cssFloat = 'left'; //Firefox
style.styleFloat = 'left'; //IE
- style.border = '2px solid #000';
+ style.padding = '2px';
style.background = 'inherit';
}(element.style));
@@ -7104,23 +7098,10 @@ function loadPanels(strip, viewerSize, scroll){
style.cursor = 'default';
style.width = ( strip.panelWidth - 4 ) + 'px';
style.height = ( strip.panelHeight - 4 ) + 'px';
- style.border = '2px solid #000';
}( miniViewer.displayRegion.style ));
miniViewer.displayRegion.innerTracker = new $.MouseTracker({
- element: miniViewer.displayRegion/*,
- focusHandler: function(){
- //tracker.element.style.border = '2px solid #437AB2';
- if( strip.currentSelected !== tracker.element ){
- tracker.element.style.background = '#ddd';
- }
- },
- blurHandler: function(){
- //tracker.element.style.border = '2px solid #000';
- if( strip.currentSelected !== tracker.element ){
- tracker.element.style.background = '#000';
- }
- }*/
+ element: miniViewer.displayRegion
});
element.getElementsByTagName('form')[ 0 ].appendChild(
@@ -8063,11 +8044,11 @@ function updateViewport( drawer ) {
)
),
highestLevel = Math.min(
- drawer.source.maxLevel,
- Math.floor(
+ Math.abs(drawer.source.maxLevel),
+ Math.abs(Math.floor(
Math.log( zeroRatioC / drawer.minPixelRatio ) /
Math.log( 2 )
- )
+ ))
),
renderPixelRatioC,
renderPixelRatioT,
diff --git a/src/drawer.js b/src/drawer.js
index 68b84f3d..1cc5082a 100644
--- a/src/drawer.js
+++ b/src/drawer.js
@@ -362,11 +362,11 @@ function updateViewport( drawer ) {
)
),
highestLevel = Math.min(
- drawer.source.maxLevel,
- Math.floor(
+ Math.abs(drawer.source.maxLevel),
+ Math.abs(Math.floor(
Math.log( zeroRatioC / drawer.minPixelRatio ) /
Math.log( 2 )
- )
+ ))
),
renderPixelRatioC,
renderPixelRatioT,
diff --git a/src/navigator.js b/src/navigator.js
index 1c60ee06..4a7da91c 100644
--- a/src/navigator.js
+++ b/src/navigator.js
@@ -40,10 +40,7 @@ $.Navigator = function( options ){
showSequenceControl: false
});
- options.minPixelRatio = Math.min(
- options.navigatorSizeRatio * $.DEFAULT_SETTINGS.minPixelRatio,
- $.DEFAULT_SETTINGS.minPixelRatio
- );
+ options.minPixelRatio = this.minPixelRatio = viewer.minPixelRatio;
(function( style ){
style.marginTop = '0px';
diff --git a/src/openseadragon.js b/src/openseadragon.js
index 79ee15b5..b32412f0 100644
--- a/src/openseadragon.js
+++ b/src/openseadragon.js
@@ -495,7 +495,7 @@ OpenSeadragon = window.OpenSeadragon || function( options ){
navigatorHeight: null,
navigatorWidth: null,
navigatorPosition: null,
- navigatorSizeRatio: 0.25,
+ navigatorSizeRatio: 0.2,
preserveViewport: false,
defaultZoomLevel: 0,
@@ -505,7 +505,7 @@ OpenSeadragon = window.OpenSeadragon || function( options ){
referenceStripHeight: null,
referenceStripWidth: null,
referenceStripPosition: 'BOTTOM_LEFT',
- referenceStripSizeRatio: 0.25,
+ referenceStripSizeRatio: 0.2,
//COLLECTION VISUALIZATION SETTINGS
collectionRows: 3,
diff --git a/src/referencestrip.js b/src/referencestrip.js
index ed377207..9657a980 100644
--- a/src/referencestrip.js
+++ b/src/referencestrip.js
@@ -64,11 +64,7 @@ $.ReferenceStrip = function( options ){
"animating": false
};
- minPixelRatio = Math.min(
- options.sizeRatio * $.DEFAULT_SETTINGS.minPixelRatio,
- $.DEFAULT_SETTINGS.minPixelRatio
- );
- this.minPixelRatio = minPixelRatio;
+ this.minPixelRatio = this.viewer.minPixelRatio;
(function( style ){
style.marginTop = '0px';
@@ -79,10 +75,11 @@ $.ReferenceStrip = function( options ){
style.bottom = '0px';
style.border = '1px solid #555';
style.background = '#000';
- //style.opacity = 0.8;
style.position = 'relative';
}( this.element.style ));
+ $.setElementOpacity( this.element, 0.8 );
+
this.viewer = viewer;
this.innerTracker = new $.MouseTracker({
element: this.element,
@@ -151,13 +148,13 @@ $.ReferenceStrip = function( options ){
element.id = this.element.id + "-" + i;
(function(style){
- style.width = this.panelWidth + 'px';
- style.height = this.panelHeight + 'px';
+ style.width = _this.panelWidth + 'px';
+ style.height = _this.panelHeight + 'px';
style.display = 'inline';
style.float = 'left'; //Webkit
style.cssFloat = 'left'; //Firefox
style.styleFloat = 'left'; //IE
- style.border = '2px solid #000';
+ style.padding = '2px';
style.background = 'inherit';
}(element.style));
@@ -360,23 +357,10 @@ function loadPanels(strip, viewerSize, scroll){
style.cursor = 'default';
style.width = ( strip.panelWidth - 4 ) + 'px';
style.height = ( strip.panelHeight - 4 ) + 'px';
- style.border = '2px solid #000';
}( miniViewer.displayRegion.style ));
miniViewer.displayRegion.innerTracker = new $.MouseTracker({
- element: miniViewer.displayRegion/*,
- focusHandler: function(){
- //tracker.element.style.border = '2px solid #437AB2';
- if( strip.currentSelected !== tracker.element ){
- tracker.element.style.background = '#ddd';
- }
- },
- blurHandler: function(){
- //tracker.element.style.border = '2px solid #000';
- if( strip.currentSelected !== tracker.element ){
- tracker.element.style.background = '#000';
- }
- }*/
+ element: miniViewer.displayRegion
});
element.getElementsByTagName('form')[ 0 ].appendChild(