Skip to content

Commit

Permalink
Edited comments and minor adjustments. Fixes #13553. Closes jquerygh-…
Browse files Browse the repository at this point in the history
  • Loading branch information
Michał Z. Gołębiowski authored and timmywil committed Mar 13, 2013
1 parent ae35246 commit 79992d7
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 27 deletions.
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,4 @@ Adam Coulombe <[email protected]>
Andrew Plummer <[email protected]>
Nguyen Phuc Lam <[email protected]>
Dmitry Gusev <[email protected]>
Michał Z. Gołębiowski <[email protected]>
2 changes: 1 addition & 1 deletion build/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function uploadToCDN( next ) {
});
});
cmds.push( next );

steps.apply( this, cmds );
}

Expand Down
2 changes: 1 addition & 1 deletion speed/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function benchmark(fn, times, name){
var s = fn.indexOf('{')+1,
e = fn.lastIndexOf('}');
fn = fn.substring(s,e);

return benchmarkString(fn, times, name);
}

Expand Down
2 changes: 1 addition & 1 deletion speed/event.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script src="../dist/jquery.js"></script>
<script>
jQuery(function(){

});

var events = [], num = 400, exec = false;
Expand Down
26 changes: 13 additions & 13 deletions speed/slice.vs.concat.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,42 @@

var SIZE = 1e4,
LOOPS = 500;

var arr = new Array(SIZE);
for ( var i=arr.length-1; i >= 0; --i )
for ( var i = arr.length - 1; i >= 0; --i )
arr[i] = 0;

var t = new Date;
for ( i=0; i < LOOPS; i++ )
for ( i = 0; i < LOOPS; i++ )
arr.slice(0);
var tslice = new Date - t;

t = new Date;
for ( i=0; i < LOOPS; i++ )
for ( i = 0; i < LOOPS; i++ )
arr.concat();
var tconcat = new Date - t;

// clone() is just to see how fast built-ins are
t = new Date;
for ( i=0; i < LOOPS; i++ )
for ( i = 0; i < LOOPS; i++ )
clone(arr);
var tclone = new Date - t;

alert([
'slice:'+tslice,
'concat:'+tconcat,
'clone:'+tclone
].join('\n'));


function clone(arr){
var i = arr.length,
copy = new Array(i);

while (i--)
copy[i] = arr[i];

return copy;
}
})();
</script>
</script>
9 changes: 5 additions & 4 deletions src/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var
// Document location
ajaxLocParts,
ajaxLocation,

ajax_nonce = jQuery.now(),

ajax_rquery = /\?/,
Expand Down Expand Up @@ -140,7 +140,7 @@ jQuery.fn.load = function( url, params, callback ) {
off = url.indexOf(" ");

if ( off >= 0 ) {
selector = url.slice( off, url.length );
selector = url.slice( off );
url = url.slice( 0, off );
}

Expand Down Expand Up @@ -427,10 +427,11 @@ jQuery.extend({
jqXHR.error = jqXHR.fail;

// Remove hash character (#7531: and string promotion)
// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
// Add protocol if not provided (prefilters might expect it)
// Handle falsy url in the settings object (#10093: consistency with old signature)
// We also use the url parameter if available
s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );

// Alias method option to type as per ticket #12004
s.type = options.method || options.type || s.method || s.type;
Expand Down
4 changes: 2 additions & 2 deletions src/dimensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
if ( elem.nodeType === 9 ) {
doc = elem.documentElement;

// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
// whichever is greatest
return Math.max(
elem.body[ "scroll" + name ], doc[ "scroll" + name ],
elem.body[ "offset" + name ], doc[ "offset" + name ],
Expand Down
4 changes: 2 additions & 2 deletions src/effects.js
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ Tween.propHooks = {
}
};

// Remove in 2.0 - this supports IE8's panic based approach
// to setting things on disconnected nodes
// Support: IE9
// Panic based approach to setting things on disconnected nodes

Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
set: function( tween ) {
Expand Down
2 changes: 1 addition & 1 deletion src/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jQuery.event = {
tmp = rtypenamespace.exec( types[t] ) || [];
type = origType = tmp[1];
namespaces = ( tmp[2] || "" ).split( "." ).sort();

// There *must* be a type, no attaching namespace-only handlers
if ( !type ) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ module( "ajax", {
strictEqual( ajaxXML.find("tab").length, 3, "Parsed node was added properly" );
}
});

ajaxTest( "#13292 - jQuery.ajax() - converter is bypassed for 204 requests", 3, {
url: "data/nocontent.php",
dataType: "testing",
Expand Down
2 changes: 1 addition & 1 deletion test/unit/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ test( "attr(String, Object)", function() {

// Setting attributes on svg elements (bug #3116)
var $svg = jQuery(
"<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' baseProfile='full' width='200' height='200'>" +
"<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' baseProfile='full' width='200' height='200'>" +

"<circle cx='200' cy='200' r='150' />" +
"</svg>"
Expand Down

0 comments on commit 79992d7

Please sign in to comment.