mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-01 07:31:41 +03:00
Code Issues Projects Releases Wiki Activity

more normalizing of where configurable options are located.

Browse Source
This commit is contained in:
thatcher 2012-02-28 10:01:45 -05:00
parent c610a9239b
commit 32c950e661
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -6,7 +6,7 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 9 BUILD_MINOR: 9
BUILD_ID: 15 BUILD_ID: 16
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

21
openseadragon.js
View File

@ -1,5 +1,5 @@
/** /**
* @version OpenSeadragon 0.9.15 * @version OpenSeadragon 0.9.16
* *
* @fileOverview * @fileOverview
* <h2> * <h2>
@ -111,9 +111,12 @@ OpenSeadragon = window.OpenSeadragon || (function(){
zoomPerScroll: 1.2, zoomPerScroll: 1.2,
zoomPerSecond: 2.0, zoomPerSecond: 2.0,
showNavigationControl: true, showNavigationControl: true,
controlsFadeDelay: 2000,
controlsFadeLength: 1500,
maxImageCacheCount: 100, maxImageCacheCount: 100,
minPixelRatio: 0.5, minPixelRatio: 0.5,
mouseNavEnabled: true, mouseNavEnabled: true,
prefixUrl: null,
navImages: { navImages: {
zoomIn: { zoomIn: {
REST: '/images/zoomin_rest.png', REST: '/images/zoomin_rest.png',
@ -2518,15 +2521,12 @@ $.Viewer = function( options ) {
id: options.id, id: options.id,
xmlPath: null, xmlPath: null,
tileSources: null, tileSources: null,
prefixUrl: null,
controls: [], controls: [],
overlays: [], overlays: [],
overlayControls: [], overlayControls: [],
config: $.DEFAULT_SETTINGS, config: $.DEFAULT_SETTINGS,
//These were referenced but never defined //These were referenced but never defined
controlsFadeDelay: 2000,
controlsFadeLength: 1500,
//These are originally not part options but declared as members //These are originally not part options but declared as members
//in initialize. Its still considered idiomatic to put them here //in initialize. Its still considered idiomatic to put them here
@ -2629,9 +2629,7 @@ $.Viewer = function( options ) {
} }
} }
////////////////////////////////////////////////////////////////////////// //private state properties
// Navigation Controls
//////////////////////////////////////////////////////////////////////////
$.extend( THIS[ this.hash ], { $.extend( THIS[ this.hash ], {
"group": null, "group": null,
// whether we should be continuously zooming // whether we should be continuously zooming
@ -2641,6 +2639,9 @@ $.Viewer = function( options ) {
"lastZoomTime": null "lastZoomTime": null
}); });
//////////////////////////////////////////////////////////////////////////
// Navigation Controls
//////////////////////////////////////////////////////////////////////////
var beginZoomingInHandler = $.delegate( this, beginZoomingIn ), var beginZoomingInHandler = $.delegate( this, beginZoomingIn ),
endZoomingHandler = $.delegate( this, endZooming ), endZoomingHandler = $.delegate( this, endZooming ),
doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ), doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ),
@ -3233,11 +3234,11 @@ function beginControlsAutoHide( viewer ) {
viewer.controlsShouldFade = true; viewer.controlsShouldFade = true;
viewer.controlsFadeBeginTime = viewer.controlsFadeBeginTime =
+new Date() + +new Date() +
viewer.controlsFadeDelay; viewer.config.controlsFadeDelay;
window.setTimeout( function(){ window.setTimeout( function(){
scheduleControlsFade( viewer ); scheduleControlsFade( viewer );
}, viewer.controlsFadeDelay ); }, viewer.config.controlsFadeDelay );
}; };
@ -3250,7 +3251,7 @@ function updateControlsFade( viewer ) {
if ( viewer.controlsShouldFade ) { if ( viewer.controlsShouldFade ) {
currentTime = new Date().getTime(); currentTime = new Date().getTime();
deltaTime = currentTime - viewer.controlsFadeBeginTime; deltaTime = currentTime - viewer.controlsFadeBeginTime;
opacity = 1.0 - deltaTime / viewer.controlsFadeLength; opacity = 1.0 - deltaTime / viewer.config.controlsFadeLength;
opacity = Math.min( 1.0, opacity ); opacity = Math.min( 1.0, opacity );
opacity = Math.max( 0.0, opacity ); opacity = Math.max( 0.0, opacity );

3
src/openseadragon.js
View File

@ -111,9 +111,12 @@ OpenSeadragon = window.OpenSeadragon || (function(){
zoomPerScroll: 1.2, zoomPerScroll: 1.2,
zoomPerSecond: 2.0, zoomPerSecond: 2.0,
showNavigationControl: true, showNavigationControl: true,
controlsFadeDelay: 2000,
controlsFadeLength: 1500,
maxImageCacheCount: 100, maxImageCacheCount: 100,
minPixelRatio: 0.5, minPixelRatio: 0.5,
mouseNavEnabled: true, mouseNavEnabled: true,
prefixUrl: null,
navImages: { navImages: {
zoomIn: { zoomIn: {
REST: '/images/zoomin_rest.png', REST: '/images/zoomin_rest.png',

16
src/viewer.js
View File

@ -52,15 +52,12 @@ $.Viewer = function( options ) {
id: options.id, id: options.id,
xmlPath: null, xmlPath: null,
tileSources: null, tileSources: null,
prefixUrl: null,
controls: [], controls: [],
overlays: [], overlays: [],
overlayControls: [], overlayControls: [],
config: $.DEFAULT_SETTINGS, config: $.DEFAULT_SETTINGS,
//These were referenced but never defined //These were referenced but never defined
controlsFadeDelay: 2000,
controlsFadeLength: 1500,
//These are originally not part options but declared as members //These are originally not part options but declared as members
//in initialize. Its still considered idiomatic to put them here //in initialize. Its still considered idiomatic to put them here
@ -163,9 +160,7 @@ $.Viewer = function( options ) {
} }
} }
////////////////////////////////////////////////////////////////////////// //private state properties
// Navigation Controls
//////////////////////////////////////////////////////////////////////////
$.extend( THIS[ this.hash ], { $.extend( THIS[ this.hash ], {
"group": null, "group": null,
// whether we should be continuously zooming // whether we should be continuously zooming
@ -175,6 +170,9 @@ $.Viewer = function( options ) {
"lastZoomTime": null "lastZoomTime": null
}); });
//////////////////////////////////////////////////////////////////////////
// Navigation Controls
//////////////////////////////////////////////////////////////////////////
var beginZoomingInHandler = $.delegate( this, beginZoomingIn ), var beginZoomingInHandler = $.delegate( this, beginZoomingIn ),
endZoomingHandler = $.delegate( this, endZooming ), endZoomingHandler = $.delegate( this, endZooming ),
doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ), doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ),
@ -767,11 +765,11 @@ function beginControlsAutoHide( viewer ) {
viewer.controlsShouldFade = true; viewer.controlsShouldFade = true;
viewer.controlsFadeBeginTime = viewer.controlsFadeBeginTime =
+new Date() + +new Date() +
viewer.controlsFadeDelay; viewer.config.controlsFadeDelay;
window.setTimeout( function(){ window.setTimeout( function(){
scheduleControlsFade( viewer ); scheduleControlsFade( viewer );
}, viewer.controlsFadeDelay ); }, viewer.config.controlsFadeDelay );
}; };
@ -784,7 +782,7 @@ function updateControlsFade( viewer ) {
if ( viewer.controlsShouldFade ) { if ( viewer.controlsShouldFade ) {
currentTime = new Date().getTime(); currentTime = new Date().getTime();
deltaTime = currentTime - viewer.controlsFadeBeginTime; deltaTime = currentTime - viewer.controlsFadeBeginTime;
opacity = 1.0 - deltaTime / viewer.controlsFadeLength; opacity = 1.0 - deltaTime / viewer.config.controlsFadeLength;
opacity = Math.min( 1.0, opacity ); opacity = Math.min( 1.0, opacity );
opacity = Math.max( 0.0, opacity ); opacity = Math.max( 0.0, opacity );