Skip to content
Permalink
Browse files

Merge branch 'master' of http://github.com/aakoch/jquery into aakoch-…

…master
  • Loading branch information
jeresig committed Sep 27, 2010
2 parents ea6a481 + a088751 commit e63fa8beb8e285fe19fc0a1557045b80e3c63c66
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/ajax.js
@@ -8,7 +8,7 @@ var jsc = jQuery.now(),
rbracket = /\[\]$/,
jsre = /\=\?(&|$)/,
rquery = /\?/,
rts = /([?&])_=[^&]*(&?)/,
rts = /([?&])_=[^&]*/,
rurl = /^(\w+:)?\/\/([^\/?#]+)/,
r20 = /%20/g,
rhash = /#.*$/,
@@ -278,7 +278,7 @@ jQuery.extend({
var ts = jQuery.now();

// try replacing _= if it is there
var ret = s.url.replace(rts, "$1_=" + ts + "$2");
var ret = s.url.replace(rts, "$1_=" + ts);

// if nothing was replaced, add timestamp to the end
s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");

0 comments on commit e63fa8b

Please sign in to comment.
You can’t perform that action at this time.