build

kiva · Feb 28, 2014 · 680a45b · 680a45b
1 parent 69a2c25
commit 680a45b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/dist/amd/jquery.ajaxHandler.js b/dist/amd/jquery.ajaxHandler.js
@@ -29,10 +29,12 @@ define(['jquery'], function ($, undefined) {
 		 * (used by unit tests)
 		 */
 		, remove: function () {
-			$.ajax = $.ajaxHandler.origAjax;
+			if ($.ajaxHandler.origAjax) {
+				$.ajax = $.ajaxHandler.origAjax;
+				$.ajaxHandler.origAjax = undefined;
+			}
 
 			delete $.ajaxHandler.options;
-			$.ajaxHandler.origAjax = undefined;
 		}
 
 
@@ -155,10 +157,12 @@ define(['jquery'], function ($, undefined) {
 		 * @param jqXhr
 		 */
 		, onBeforeSend: function (jqXhr, options) {
-			var ajaxHandlerOptions = options.ajaxHandlerOptions;
+			var origUrl
+			, ajaxHandlerOptions = options.ajaxHandlerOptions;
 
-			if (typeof ajaxHandlerOptions.url == 'function') {
-				options.url = ajaxHandlerOptions.url.call(this, options);
+			if (typeof ajaxHandlerOptions.corsUrl == 'function') {
+				origUrl = options.url;
+				options.url = ajaxHandlerOptions.corsUrl.call(this, options);
 			}
 
 			// Add any custom request headers
@@ -168,6 +172,10 @@ define(['jquery'], function ($, undefined) {
 				});
 			}
 
+			if (origUrl) {
+				options.url = origUrl;
+			}
+
 			// Make sure to call any pre-existing .beforeSend() callbacks
 			if (typeof ajaxHandlerOptions.origBeforeSend == 'function') {
 				ajaxHandlerOptions.origBeforeSend.call(this, jqXhr, options);

diff --git a/dist/amd/jquery.ajaxHandler.min.js b/dist/amd/jquery.ajaxHandler.min.js
diff --git a/dist/iife/jquery.ajaxHandler.js b/dist/iife/jquery.ajaxHandler.js
@@ -29,10 +29,12 @@
 		 * (used by unit tests)
 		 */
 		, remove: function () {
-			$.ajax = $.ajaxHandler.origAjax;
+			if ($.ajaxHandler.origAjax) {
+				$.ajax = $.ajaxHandler.origAjax;
+				$.ajaxHandler.origAjax = undefined;
+			}
 
 			delete $.ajaxHandler.options;
-			$.ajaxHandler.origAjax = undefined;
 		}
 
 
@@ -155,10 +157,12 @@
 		 * @param jqXhr
 		 */
 		, onBeforeSend: function (jqXhr, options) {
-			var ajaxHandlerOptions = options.ajaxHandlerOptions;
+			var origUrl
+			, ajaxHandlerOptions = options.ajaxHandlerOptions;
 
-			if (typeof ajaxHandlerOptions.url == 'function') {
-				options.url = ajaxHandlerOptions.url.call(this, options);
+			if (typeof ajaxHandlerOptions.corsUrl == 'function') {
+				origUrl = options.url;
+				options.url = ajaxHandlerOptions.corsUrl.call(this, options);
 			}
 
 			// Add any custom request headers
@@ -168,6 +172,10 @@
 				});
 			}
 
+			if (origUrl) {
+				options.url = origUrl;
+			}
+
 			// Make sure to call any pre-existing .beforeSend() callbacks
 			if (typeof ajaxHandlerOptions.origBeforeSend == 'function') {
 				ajaxHandlerOptions.origBeforeSend.call(this, jqXhr, options);

diff --git a/dist/iife/jquery.ajaxHandler.min.js b/dist/iife/jquery.ajaxHandler.min.js