diff options
author | Michał Z. Gołębiowski <michal.golebiowski@laboratorium.ee> | 2013-03-12 21:06:25 -0400 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2013-03-12 21:06:25 -0400 |
commit | 79992d752393d80822a4f8be2b7bec3ecdd60f6a (patch) | |
tree | 2c97c4bda379e70501b15f106f5efa241c220fe3 | |
parent | ae3524642c54ec4df09733de03c169f4fd43ac34 (diff) | |
download | jquery-79992d752393d80822a4f8be2b7bec3ecdd60f6a.tar.gz jquery-79992d752393d80822a4f8be2b7bec3ecdd60f6a.zip |
Edited comments and minor adjustments. Fixes #13553. Closes gh-1195.
-rw-r--r-- | AUTHORS.txt | 1 | ||||
-rw-r--r-- | build/release.js | 2 | ||||
-rw-r--r-- | speed/benchmark.js | 2 | ||||
-rw-r--r-- | speed/event.html | 2 | ||||
-rw-r--r-- | speed/slice.vs.concat.html | 26 | ||||
-rw-r--r-- | src/ajax.js | 9 | ||||
-rw-r--r-- | src/dimensions.js | 4 | ||||
-rw-r--r-- | src/effects.js | 4 | ||||
-rw-r--r-- | src/event.js | 2 | ||||
-rw-r--r-- | test/unit/ajax.js | 2 | ||||
-rw-r--r-- | test/unit/attributes.js | 2 |
11 files changed, 29 insertions, 27 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt index a62455fe6..5bbfb7d5f 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -163,3 +163,4 @@ Adam Coulombe <me@adam.co> Andrew Plummer <plummer.andrew@gmail.com> Nguyen Phuc Lam <ruado1987@gmail.com> Dmitry Gusev <dmitry.gusev@gmail.com> +Michał Z. Gołębiowski <michal.golebiowski@laboratorium.ee> diff --git a/build/release.js b/build/release.js index 36f96f0b5..d2bff0f16 100644 --- a/build/release.js +++ b/build/release.js @@ -181,7 +181,7 @@ function uploadToCDN( next ) { }); }); cmds.push( next ); - + steps.apply( this, cmds ); } diff --git a/speed/benchmark.js b/speed/benchmark.js index b970e14af..334abf15d 100644 --- a/speed/benchmark.js +++ b/speed/benchmark.js @@ -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); } diff --git a/speed/event.html b/speed/event.html index 6d463b4d8..eb4dfc7ce 100644 --- a/speed/event.html +++ b/speed/event.html @@ -8,7 +8,7 @@ <script src="../dist/jquery.js"></script> <script> jQuery(function(){ - + }); var events = [], num = 400, exec = false; diff --git a/speed/slice.vs.concat.html b/speed/slice.vs.concat.html index 949c5f962..a5372a690 100644 --- a/speed/slice.vs.concat.html +++ b/speed/slice.vs.concat.html @@ -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>
\ No newline at end of file +</script> diff --git a/src/ajax.js b/src/ajax.js index f12b231a8..3ceb82c6d 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -2,7 +2,7 @@ var // Document location ajaxLocParts, ajaxLocation, - + ajax_nonce = jQuery.now(), ajax_rquery = /\?/, @@ -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 ); } @@ -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; diff --git a/src/dimensions.js b/src/dimensions.js index 9e4d5729d..ae59fb05d 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -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 ], diff --git a/src/effects.js b/src/effects.js index 764895200..c0f558aec 100644 --- a/src/effects.js +++ b/src/effects.js @@ -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 ) { diff --git a/src/event.js b/src/event.js index c9de8e617..d784e1c66 100644 --- a/src/event.js +++ b/src/event.js @@ -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; diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 040485098..79f410406 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -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", diff --git a/test/unit/attributes.js b/test/unit/attributes.js index aa232e887..7d0366b90 100644 --- a/test/unit/attributes.js +++ b/test/unit/attributes.js @@ -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>" |