mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 21:26:10 +03:00
Code Issues Projects Releases Wiki Activity

prefixUrl configuration option was mangled as prefixURL in OpenSeadragon.Button leading to general inconsistency.

Browse Source
This commit is contained in:
thatcher 2012-02-27 16:50:22 -05:00
parent 26fb61cc65
commit e73ed421e4
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openseadragon.js
View File

@ -2461,8 +2461,7 @@ $.Viewer = function( options ) {
$.extend( true, this, { $.extend( true, this, {
id: options.id, id: options.id,
xmlPath: null, xmlPath: null,
dzis: null, tileSources: null,
images: null,
prefixUrl: '', prefixUrl: '',
controls: [], controls: [],
overlays: [], overlays: [],
@ -2726,8 +2725,10 @@ $.Viewer = function( options ) {
if ( this.xmlPath ){ if ( this.xmlPath ){
//Deprecated option. Now it is preferred to use the tileSources option //Deprecated option. Now it is preferred to use the tileSources option
this.openDzi( this.xmlPath ); this.tileSources = [ this.xmlPath ];
} else if ( this.tileSources ){ }
if ( this.tileSources ){
//tileSource is a complex option... //tileSource is a complex option...
//It can be a string, object, function, or an array of any of these. //It can be a string, object, function, or an array of any of these.
//A string implies a DZI //A string implies a DZI
@ -4199,10 +4200,10 @@ $.Button = function( options ) {
this.config.clickTimeThreshold, this.config.clickTimeThreshold,
this.config.clickDistThreshold this.config.clickDistThreshold
); );
this.imgRest = $.makeTransparentImage( this.config.prefixURL + this.srcRest ); this.imgRest = $.makeTransparentImage( this.config.prefixUrl + this.srcRest );
this.imgGroup = $.makeTransparentImage( this.config.prefixURL + this.srcGroup ); this.imgGroup = $.makeTransparentImage( this.config.prefixUrl + this.srcGroup );
this.imgHover = $.makeTransparentImage( this.config.prefixURL + this.srcHover ); this.imgHover = $.makeTransparentImage( this.config.prefixUrl + this.srcHover );
this.imgDown = $.makeTransparentImage( this.config.prefixURL + this.srcDown ); this.imgDown = $.makeTransparentImage( this.config.prefixUrl + this.srcDown );
this.fadeDelay = 0; // begin fading immediately this.fadeDelay = 0; // begin fading immediately
this.fadeLength = 2000; // fade over a period of 2 seconds this.fadeLength = 2000; // fade over a period of 2 seconds

8
src/button.js
View File

@ -88,10 +88,10 @@ $.Button = function( options ) {
this.config.clickTimeThreshold, this.config.clickTimeThreshold,
this.config.clickDistThreshold this.config.clickDistThreshold
); );
this.imgRest = $.makeTransparentImage( this.config.prefixURL + this.srcRest ); this.imgRest = $.makeTransparentImage( this.config.prefixUrl + this.srcRest );
this.imgGroup = $.makeTransparentImage( this.config.prefixURL + this.srcGroup ); this.imgGroup = $.makeTransparentImage( this.config.prefixUrl + this.srcGroup );
this.imgHover = $.makeTransparentImage( this.config.prefixURL + this.srcHover ); this.imgHover = $.makeTransparentImage( this.config.prefixUrl + this.srcHover );
this.imgDown = $.makeTransparentImage( this.config.prefixURL + this.srcDown ); this.imgDown = $.makeTransparentImage( this.config.prefixUrl + this.srcDown );
this.fadeDelay = 0; // begin fading immediately this.fadeDelay = 0; // begin fading immediately
this.fadeLength = 2000; // fade over a period of 2 seconds this.fadeLength = 2000; // fade over a period of 2 seconds

9
src/viewer.js
View File

@ -51,8 +51,7 @@ $.Viewer = function( options ) {
$.extend( true, this, { $.extend( true, this, {
id: options.id, id: options.id,
xmlPath: null, xmlPath: null,
dzis: null, tileSources: null,
images: null,
prefixUrl: '', prefixUrl: '',
controls: [], controls: [],
overlays: [], overlays: [],
@ -316,8 +315,10 @@ $.Viewer = function( options ) {
if ( this.xmlPath ){ if ( this.xmlPath ){
//Deprecated option. Now it is preferred to use the tileSources option //Deprecated option. Now it is preferred to use the tileSources option
this.openDzi( this.xmlPath ); this.tileSources = [ this.xmlPath ];
} else if ( this.tileSources ){ }
if ( this.tileSources ){
//tileSource is a complex option... //tileSource is a complex option...
//It can be a string, object, function, or an array of any of these. //It can be a string, object, function, or an array of any of these.
//A string implies a DZI //A string implies a DZI