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

Merge pull request #273 from msalsbery/bad-code-fix

Browse Source 
Cleaned up some messy javascript
This commit is contained in:
iangilman 2013-11-12 10:20:59 -08:00
commit a1c9b977dc
1 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/openseadragon.js
View File

@ -296,13 +296,6 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
toString = Object.prototype.toString, toString = Object.prototype.toString,
hasOwn = Object.prototype.hasOwnProperty; hasOwn = Object.prototype.hasOwnProperty;
// Detects canvas support
function isCanvasSupported() {
var canvasElement = document.createElement( 'canvas' );
return !!( $.isFunction( canvasElement.getContext ) &&
canvasElement.getContext( '2d' ) );
}
/** /**
* Taken from jQuery 1.6.1 * Taken from jQuery 1.6.1
* @name $.isFunction * @name $.isFunction
@ -400,45 +393,11 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
* @name $.supportsCanvas * @name $.supportsCanvas
* @property * @property
*/ */
$.supportsCanvas = isCanvasSupported(); $.supportsCanvas = (function () {
var canvasElement = document.createElement( 'canvas' );
return !!( $.isFunction( canvasElement.getContext ) &&
/** canvasElement.getContext( '2d' ) );
* Detect event model and create appropriate _addEvent/_removeEvent methods }());
*/
if ( window.addEventListener ) {
$._addEvent = function ( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.addEventListener( eventName, handler, useCapture );
};
} else if ( window.attachEvent ) {
$._addEvent = function ( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.attachEvent( 'on' + eventName, handler );
if ( useCapture && element.setCapture ) {
element.setCapture();
}
};
} else {
throw new Error( "No known event model." );
}
if ( window.removeEventListener ) {
$._removeEvent = function ( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.removeEventListener( eventName, handler, useCapture );
};
} else if ( window.detachEvent ) {
$._removeEvent = function( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.detachEvent( 'on' + eventName, handler );
if ( useCapture && element.releaseCapture ) {
element.releaseCapture();
}
};
} else {
throw new Error( "No known event model." );
}
}( OpenSeadragon )); }( OpenSeadragon ));
@ -1250,9 +1209,24 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
* @param {Function} handler * @param {Function} handler
* @param {Boolean} [useCapture] * @param {Boolean} [useCapture]
*/ */
addEvent: function( element, eventName, handler, useCapture ) { addEvent: (function () {
return $._addEvent( element, eventName, handler, useCapture ); if ( window.addEventListener ) {
}, return function ( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.addEventListener( eventName, handler, useCapture );
};
} else if ( window.attachEvent ) {
return function ( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.attachEvent( 'on' + eventName, handler );
if ( useCapture && element.setCapture ) {
element.setCapture();
}
};
} else {
throw new Error( "No known event model." );
}
}()),
/** /**
@ -1265,9 +1239,24 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
* @param {Function} handler * @param {Function} handler
* @param {Boolean} [useCapture] * @param {Boolean} [useCapture]
*/ */
removeEvent: function( element, eventName, handler, useCapture ) { removeEvent: (function () {
return $._removeEvent( element, eventName, handler, useCapture ); if ( window.removeEventListener ) {
}, return function ( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.removeEventListener( eventName, handler, useCapture );
};
} else if ( window.detachEvent ) {
return function( element, eventName, handler, useCapture ) {
element = $.getElement( element );
element.detachEvent( 'on' + eventName, handler );
if ( useCapture && element.releaseCapture ) {
element.releaseCapture();
}
};
} else {
throw new Error( "No known event model." );
}
}()),
/** /**