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

Merge pull request #149 from acdha/simplified-ajax-requests

Browse Source 
Simplify OpenSeadragon.makeAjaxRequest
This commit is contained in:
iangilman 2013-07-01 09:21:30 -07:00
commit 73edc5935b
1 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/openseadragon.js
View File

@ -1306,64 +1306,48 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
* @function * @function
* @name OpenSeadragon.makeAjaxRequest * @name OpenSeadragon.makeAjaxRequest
* @param {String} url - the url to request * @param {String} url - the url to request
* @param {Function} [callback] - a function to call when complete * @param {Function} onSuccess - a function to call on a successful response
* @param {Function} onError - a function to call on when an error occurs
* @throws {Error} * @throws {Error}
*/ */
makeAjaxRequest: function( url, callback ) { makeAjaxRequest: function( url, onSuccess, onError ) {
var request = $.createAjaxRequest();
var async = true, if (!$.isFunction(onSuccess)) {
request = $.createAjaxRequest(), throw new Error( "makeAjaxRequest requires a success callback" );
options;
if( $.isPlainObject( url ) ){
options.async = options.async || async;
}else{
options = {
url: url,
async: $.isFunction( callback ),
success: callback,
error: null
};
} }
if ( options.async ) { request.onreadystatechange = function() {
/** @ignore */ // 4 = DONE (https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#Properties)
request.onreadystatechange = function() { if ( request.readyState == 4 ) {
// 4 = DONE (https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#Properties) request.onreadystatechange = function(){};
if ( request.readyState == 4) {
request.onreadystatechange = function(){}; if ( request.status == 200 ) {
options.success( request ); onSuccess( request );
} else {
$.console.log("AJAX request returned %s: %s", request.status, url);
if ($.isFunction(onError)) {
onError( request );
}
} }
}; }
} };
try { try {
request.open( "GET", options.url, options.async ); request.open( "GET", url, true );
request.send( null ); request.send( null );
} catch (e) { } catch (e) {
$.console.log( $.console.log("%s while making AJAX request: %s", e.name, e.message);
"%s while making AJAX request: %s",
e.name,
e.message
);
request.onreadystatechange = function(){}; request.onreadystatechange = function(){};
request = null;
if ( options.error && $.isFunction( options.error ) ) { if ($.isFunction(onError)) {
options.error( request ); onError( request, e );
} }
} }
if( !options.async && $.isFunction( options.success ) ){
options.success( request );
}
return options.async ? null : request;
}, },
/** /**
* Taken from jQuery 1.6.1 * Taken from jQuery 1.6.1
* @function * @function