From f1dcaad09736c194f9148e5bf5fb08498a483a7a Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Fri, 18 May 2012 13:28:50 -0400 Subject: [PATCH] Fix indentation in /speed and /test dirs, closes gh-780. --- speed/benchmark.js | 8 +- speed/benchmarker.css | 30 +-- speed/benchmarker.js | 76 ++++---- speed/closest.html | 40 ++-- speed/filter.html | 326 ++++++++++++++++---------------- speed/find.html | 322 +++++++++++++++---------------- speed/index.html | 68 +++---- speed/jquery-basis.js | 2 +- test/csp.php | 4 +- test/data/etag.php | 4 +- test/data/event/asyncReady.html | 4 +- test/data/if_modified_since.php | 4 +- test/data/iframe.html | 12 +- test/delegatetest.html | 54 +++--- test/hovertest.html | 52 ++--- test/polluted.php | 2 +- test/unit/ajax.js | 190 +++++++++---------- test/unit/core.js | 94 ++++----- 18 files changed, 646 insertions(+), 646 deletions(-) diff --git a/speed/benchmark.js b/speed/benchmark.js index 50d5cad69..b970e14af 100644 --- a/speed/benchmark.js +++ b/speed/benchmark.js @@ -5,11 +5,11 @@ function benchmark(fn, times, name){ e = fn.lastIndexOf('}'); fn = fn.substring(s,e); - return benchmarkString(fn, times, name); + return benchmarkString(fn, times, name); } function benchmarkString(fn, times, name) { - var fn = new Function("i", "var t=new Date; while(i--) {" + fn + "}; return new Date - t")(times) - fn.displayName = name || "benchmarked"; - return fn; + var fn = new Function("i", "var t=new Date; while(i--) {" + fn + "}; return new Date - t")(times) + fn.displayName = name || "benchmarked"; + return fn; } diff --git a/speed/benchmarker.css b/speed/benchmarker.css index 6fc8154c6..6c5b4c35b 100644 --- a/speed/benchmarker.css +++ b/speed/benchmarker.css @@ -1,10 +1,10 @@ - .dialog { - margin-bottom: 1em; - } - a.expand { - background: #e3e3e3; - } + .dialog { + margin-bottom: 1em; + } + a.expand { + background: #e3e3e3; + } div#time-test { font-family: Arial, Helvetica, sans-serif; @@ -42,14 +42,14 @@ text-align: center; } - #time-test { - margin: 1em 0; - padding: .5em; - background: #e3e3e3; - } - #time-taken { - font-weight: bold; - } + #time-test { + margin: 1em 0; + padding: .5em; + background: #e3e3e3; + } + #time-taken { + font-weight: bold; + } span.wins { color: #330; @@ -62,4 +62,4 @@ div.buttons { margin-top: 10px; margin-bottom: 10px; - } \ No newline at end of file + } diff --git a/speed/benchmarker.js b/speed/benchmarker.js index bfcc16ed9..602f5ac31 100644 --- a/speed/benchmarker.js +++ b/speed/benchmarker.js @@ -1,41 +1,41 @@ jQuery.benchmarker.tests = [ - // Selectors from: - // http://ejohn.org/blog/selectors-that-people-actually-use/ - /* - // For Amazon.com - "#navAmazonLogo", "#navSwmSkedPop", - ".navbar", ".navGreeting", - "div", "table", - "img.navCrossshopTabCap", "span.navGreeting", - "#navbar table", "#navidWelcomeMsg span", - "div#navbar", "ul#navAmazonLogo", - "#navAmazonLogo .navAmazonLogoGatewayPanel", "#navidWelcomeMsg .navGreeting", - ".navbar .navAmazonLogoGatewayPanel", ".navbar .navGreeting", - "*", - "#navAmazonLogo li.navAmazonLogoGatewayPanel", "#navidWelcomeMsg span.navGreeting", - "a[name=top]", "form[name=site-search]", - ".navbar li", ".navbar span", - "[name=top]", "[name=site-search]", - "ul li", "a img", - "#navbar #navidWelcomeMsg", "#navbar #navSwmDWPop", - "#navbar ul li", "#navbar a img" - */ - // For Yahoo.com - "#page", "#masthead", "#mastheadhd", - ".mastheadbd", ".first", ".on", - "div", "li", "a", - "div.mastheadbd", "li.first", "li.on", - "#page div", "#dtba span", - "div#page", "div#masthead", - "#page .mastheadbd", "#page .first", - ".outer_search_container .search_container", ".searchbox_container .inputtext", - "*", - "#page div.mastheadbd", "#page li.first", - "input[name=p]", "a[name=marketplace]", - ".outer_search_container div", ".searchbox_container span", - "[name=p]", "[name=marketplace]", - "ul li", "form input", - "#page #e2econtent", "#page #e2e" + // Selectors from: + // http://ejohn.org/blog/selectors-that-people-actually-use/ + /* + // For Amazon.com + "#navAmazonLogo", "#navSwmSkedPop", + ".navbar", ".navGreeting", + "div", "table", + "img.navCrossshopTabCap", "span.navGreeting", + "#navbar table", "#navidWelcomeMsg span", + "div#navbar", "ul#navAmazonLogo", + "#navAmazonLogo .navAmazonLogoGatewayPanel", "#navidWelcomeMsg .navGreeting", + ".navbar .navAmazonLogoGatewayPanel", ".navbar .navGreeting", + "*", + "#navAmazonLogo li.navAmazonLogoGatewayPanel", "#navidWelcomeMsg span.navGreeting", + "a[name=top]", "form[name=site-search]", + ".navbar li", ".navbar span", + "[name=top]", "[name=site-search]", + "ul li", "a img", + "#navbar #navidWelcomeMsg", "#navbar #navSwmDWPop", + "#navbar ul li", "#navbar a img" + */ + // For Yahoo.com + "#page", "#masthead", "#mastheadhd", + ".mastheadbd", ".first", ".on", + "div", "li", "a", + "div.mastheadbd", "li.first", "li.on", + "#page div", "#dtba span", + "div#page", "div#masthead", + "#page .mastheadbd", "#page .first", + ".outer_search_container .search_container", ".searchbox_container .inputtext", + "*", + "#page div.mastheadbd", "#page li.first", + "input[name=p]", "a[name=marketplace]", + ".outer_search_container div", ".searchbox_container span", + "[name=p]", "[name=marketplace]", + "ul li", "form input", + "#page #e2econtent", "#page #e2e" ]; jQuery.fn.benchmark = function() { @@ -110,7 +110,7 @@ timeArr.push(new Date() - time); } var diff = Math.sum(timeArr) - Math.max.apply( Math, timeArr ) - - Math.min.apply( Math, timeArr ); + - Math.min.apply( Math, timeArr ); try { var libRes = window[libraries[0]](code); var jqRes = jQuery(code); diff --git a/speed/closest.html b/speed/closest.html index bb31f5d8b..12469f7db 100644 --- a/speed/closest.html +++ b/speed/closest.html @@ -6,34 +6,34 @@ - + }); + }); + -
-

Hello

-
-
-

lorem ipsum

-

dolor sit amet

-
-
-
- +
+

Hello

+
+
+

lorem ipsum

+

dolor sit amet

+
+
+
+ diff --git a/speed/filter.html b/speed/filter.html index 43ee94e52..e19e82c61 100644 --- a/speed/filter.html +++ b/speed/filter.html @@ -6,178 +6,178 @@ - + }); + }); + -
-

Hello

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
+

Hello

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/speed/find.html b/speed/find.html index d3a2dc129..01ed1d3a1 100644 --- a/speed/find.html +++ b/speed/find.html @@ -6,174 +6,174 @@ - + }); + }); + -
-

Hello

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +
+

Hello

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/speed/index.html b/speed/index.html index 717ca7317..d5810a2d1 100644 --- a/speed/index.html +++ b/speed/index.html @@ -19,52 +19,52 @@

Using the following selector expressions ( times each):

NOTE: Number shown is an average.

- - + + - - + +
- - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + +
Run?Test
Run?Test
-
- - - - - +
+ + + + + -
+
diff --git a/speed/jquery-basis.js b/speed/jquery-basis.js index 6fe017c1c..fc1842087 100644 --- a/speed/jquery-basis.js +++ b/speed/jquery-basis.js @@ -708,7 +708,7 @@ jQuery.extend({ /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) || /(msie) ([\w.]+)/.exec( ua ) || !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || - []; + []; return { browser: match[1] || "", version: match[2] || "0" }; }, diff --git a/test/csp.php b/test/csp.php index 46cba8348..3a029eb42 100644 --- a/test/csp.php +++ b/test/csp.php @@ -2,10 +2,10 @@ - + CSP Test Page - +

CSP Test Page

diff --git a/test/data/etag.php b/test/data/etag.php index 7bcfcd1e6..f6abc26e4 100644 --- a/test/data/etag.php +++ b/test/data/etag.php @@ -6,8 +6,8 @@ $etag = md5($ts); $ifNoneMatch = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : false; if ($ifNoneMatch == $etag) { - header('HTTP/1.0 304 Not Modified'); - die; // stop processing + header('HTTP/1.0 304 Not Modified'); + die; // stop processing } header("Etag: " . $etag); diff --git a/test/data/event/asyncReady.html b/test/data/event/asyncReady.html index 0b389d854..1d18efc17 100644 --- a/test/data/event/asyncReady.html +++ b/test/data/event/asyncReady.html @@ -17,7 +17,7 @@ if ( document.attachEvent ) { jQuery("body").append("
modifying DOM
"); window.parent.iframeCallback( true ); }); - } + } document.getElementsByTagName("head")[ 0 ].appendChild( el ); el.src = "../include_js.php"; }, 1000 ); @@ -28,4 +28,4 @@ if ( document.attachEvent ) { - \ No newline at end of file + diff --git a/test/data/if_modified_since.php b/test/data/if_modified_since.php index e37a93e57..098b7da85 100644 --- a/test/data/if_modified_since.php +++ b/test/data/if_modified_since.php @@ -5,8 +5,8 @@ $ts = $_REQUEST['ts']; $ifModifiedSince = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']) : false; if ($ifModifiedSince == $ts) { - header('HTTP/1.0 304 Not Modified'); - die; // stop processing + header('HTTP/1.0 304 Not Modified'); + die; // stop processing } header("Last-Modified: " . $ts); diff --git a/test/data/iframe.html b/test/data/iframe.html index 3ff26e161..ad646c430 100644 --- a/test/data/iframe.html +++ b/test/data/iframe.html @@ -1,8 +1,8 @@ - - iframe - - -
span text
- + + iframe + + +
span text
+ diff --git a/test/delegatetest.html b/test/delegatetest.html index a291763b2..b16771d3d 100644 --- a/test/delegatetest.html +++ b/test/delegatetest.html @@ -89,37 +89,37 @@ th, td {

NOTE: Only IE supports propertychange, beforeactivate, beforedeactivate; buttons do not support change events.

-

Submit Tests

- +

Submit Tests

+
- - - - - + + + + + - - - - - + + + + + -
- Submit each: - -
- -
- 		-
- -
- 		-
- -
- 		$(document).bind('submit') + Submit each: + +
+ +
+ 		+
+ +
+ 		+
+ +
+ 		$(document).bind('submit')
Results:TEXTPASSWORDBUTTONDOCUMENTResults:TEXTPASSWORDBUTTONDOCUMENT
+
diff --git a/test/hovertest.html b/test/hovertest.html index 2d2736a65..a0efd9f4f 100644 --- a/test/hovertest.html +++ b/test/hovertest.html @@ -31,64 +31,64 @@ p { -

Hover (mouse{over,out,enter,leave}) Tests

+

Hover (mouse{over,out,enter,leave}) Tests

Be sure to try moving the mouse out of the browser via the left side on each test.

- +
-
+
.hover() in/out: 0 / 0
-
- Mouse over here should NOT trigger the counter. -
+
+ Mouse over here should NOT trigger the counter. +
-
+
Live enter/leave: 0 / 0
-
- Mouse over here should NOT trigger the counter. -
+
+ Mouse over here should NOT trigger the counter. +
-
+
Delegated enter/leave: 0 / 0
-
- Mouse over here should NOT trigger the counter. -
+
+ Mouse over here should NOT trigger the counter. +
-
+
Bind over/out: 0 / 0
-
- Mouse over here SHOULD trigger the counter. -
+
+ Mouse over here SHOULD trigger the counter. +
-
+
Live over/out: 0 / 0
-
- Mouse over here SHOULD trigger the counter. -
+
+ Mouse over here SHOULD trigger the counter. +
-
+
Delegated over/out: 0 / 0
-
- Mouse over here SHOULD trigger the counter. -
+
+ Mouse over here SHOULD trigger the counter. +
diff --git a/test/polluted.php b/test/polluted.php index 50fc7cd68..54b52d20d 100644 --- a/test/polluted.php +++ b/test/polluted.php @@ -63,7 +63,7 @@ - + Run jQuery Test Suite Polluted