X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fajax.js;h=35995f6b640584cf3eae13a2a099486f8d82ba39;hb=7120b56caa235ae9315aab0634d9ff7e21c300fd;hp=d4f2e12714b0634dab19be08f75e36b5db936fdf;hpb=aee221d33c2db2c76639dabeca2b1e3d022e348e;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index d4f2e12..35995f6 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -200,7 +200,7 @@ jQuery.extend({
 		if ( s.cache === false && s.type.toLowerCase() == "get" ) {
 			var ts = (new Date()).getTime();
 			// try replacing _= if it is there
-			var ret = s.url.replace(/(\?|&)_=.*(&|$)/, "$1_=" + ts + "$2");
+			var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
 			// if nothing was replaced, add timestamp to the end
 			s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
 		}
@@ -218,8 +218,8 @@ jQuery.extend({
 			jQuery.event.trigger( "ajaxStart" );
 
 		// If we're requesting a remote document
-		// and trying to load JSON or Script
-		if ( !s.url.indexOf("http") && ( s.dataType == "script" || s.dataType =="json" ) ) {
+		// and trying to load JSON or Script with a GET
+		if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
 			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;