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

Reverted breaking change for issue #201

Browse Source 
To be grouped with other breaking changes for major version release.
Also, minor formatting fix in src/eventhandler.js
This commit is contained in:
Mark Salsbery 2013-08-27 10:10:55 -07:00
parent 57ae0656c1
commit c7f184f199
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eventhandler.js
View File

@ -122,9 +122,9 @@ $.EventHandler.prototype = {
Array.apply( null, events ); Array.apply( null, events );
return function ( source, args ) { return function ( source, args ) {
var i, var i,
length = events.length; length = events.length;
for ( i = 0; i < length; i++ ) { for ( i = 0; i < length; i++ ) {
if (events[ i ]) { if ( events[ i ] ) {
args.userData = events[ i ].userData; args.userData = events[ i ].userData;
events[ i ].handler( source, args ); events[ i ].handler( source, args );
} }

16
src/tilesource.js
View File

@ -117,8 +117,15 @@ $.TileSource = function( width, height, tileSize, tileOverlap, minLevel, maxLeve
for ( i = 0; i < arguments.length; i++ ) { for ( i = 0; i < arguments.length; i++ ) {
if ( $.isFunction( arguments[ i ] ) ) { if ( $.isFunction( arguments[ i ] ) ) {
callback = arguments[ i ]; callback = arguments[ i ];
this.addHandler( 'ready', function ( placeHolderSource, placeHolderArgs ) { // TODO Send generic object wrapping readySource as a property (breaking change)
callback( placeHolderArgs.tileSource ); // TODO Maybe placeHolderSource should be passed to callback as well for consistency
// with event handler signature?
// Should be this (although technically it works as-is):
//this.addHandler( 'ready', function ( placeHolderSource, placeHolderArgs ) {
// callback( placeHolderArgs );
//} );
this.addHandler( 'ready', function ( placeHolderSource, readySource ) {
callback( readySource );
} ); } );
//only one callback per constructor //only one callback per constructor
break; break;
@ -301,7 +308,10 @@ $.TileSource.prototype = {
options = $TileSource.prototype.configure.apply( _this, [ data, url ]); options = $TileSource.prototype.configure.apply( _this, [ data, url ]);
readySource = new $TileSource( options ); readySource = new $TileSource( options );
_this.ready = true; _this.ready = true;
_this.raiseEvent( 'ready', { tileSource: readySource } ); // TODO Send generic object wrapping readySource as a property (breaking change)
// Should be this:
//_this.raiseEvent( 'ready', { tileSource: readySource } );
_this.raiseEvent( 'ready', readySource );
}; };
if( url.match(/\.js$/) ){ if( url.match(/\.js$/) ){