Skip to content

Commit dd90046

Browse files
mikesherovdmethvin
mikesherov
authored and
dmethvin
committed
Fix #10902. DRY up the ways to include src files in tests.
1 parent f724bc6 commit dd90046

21 files changed

+122
-297
lines changed

‎test/csp.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,7 @@
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>CSP Test Page</title>
77

8-
<script src="../src/core.js"></script>
9-
<script src="../src/deferred.js"></script>
10-
<script src="../src/support.js"></script>
11-
<script src="../src/data.js"></script>
12-
<script src="../src/queue.js"></script>
13-
<script src="../src/attributes.js"></script>
14-
<script src="../src/event.js"></script>
15-
<script src="../src/sizzle/sizzle.js"></script>
16-
<script src="../src/sizzle-jquery.js"></script>
17-
<script src="../src/traversing.js"></script>
18-
<script src="../src/manipulation.js"></script>
19-
<script src="../src/css.js"></script>
20-
<script src="../src/ajax.js"></script>
21-
<script src="../src/ajax/jsonp.js"></script>
22-
<script src="../src/ajax/script.js"></script>
23-
<script src="../src/ajax/xhr.js"></script>
24-
<script src="../src/effects.js"></script>
25-
<script src="../src/offset.js"></script>
26-
<script src="../src/dimensions.js"></script>
8+
<script src="data/include_js.php"></script>
279
</head>
2810
<body>
2911
<p>CSP Test Page</p>

‎test/data/include_js.php‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/*
2+
<?php
3+
// if php is available, close the comment so PHP can echo the appropriate JS
4+
echo "*" . "/";
5+
6+
// initialize vars
7+
$output = "";
8+
$version = "";
9+
10+
// extract vars from referrer to determine version
11+
if(isset($_SERVER['HTTP_REFERER'])){
12+
$referrer = $_SERVER['HTTP_REFERER'];
13+
$referrer_query_string = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY );
14+
parse_str($referrer_query_string, $referrer_params);
15+
16+
if(isset($referrer_params['jquery'])){
17+
$version = $referrer_params['jquery'];
18+
}
19+
}
20+
21+
// load up built versions of jquery
22+
if( $version === "min" ) {
23+
$output = @file_get_contents("../../dist/jquery.min.js");
24+
}elseif( $version === "dist" ) {
25+
$output = @file_get_contents("../../dist/jquery.js");
26+
}elseif( ctype_digit( substr( $version, 0, 1 )) || $version === "git" ) {
27+
$output = "document.write('<script src=\"http://code.jquery.com/jquery-" . $version . ".js\"><'+'/script>');";
28+
}
29+
30+
// the concatenated version of the the src files is both the default and the fallback
31+
// because it does not require you to "make" jquery for it to update
32+
if( $output === "" ) {
33+
$files = array(
34+
"intro",
35+
"core",
36+
"callbacks",
37+
"deferred",
38+
"support",
39+
"data",
40+
"queue",
41+
"attributes",
42+
"event",
43+
"sizzle/sizzle",
44+
"sizzle-jquery",
45+
"traversing",
46+
"manipulation",
47+
"css",
48+
"ajax",
49+
"ajax/jsonp",
50+
"ajax/script",
51+
"ajax/xhr",
52+
"effects",
53+
"offset",
54+
"dimensions",
55+
"exports",
56+
"outro"
57+
);
58+
59+
foreach ( $files as $file ) {
60+
$output .= file_get_contents( "../../src/" . $file . ".js" );
61+
}
62+
63+
$output = str_replace( "(function( jQuery ) {", "", $output );
64+
$output = str_replace( "})( jQuery );", "", $output );
65+
}
66+
67+
echo $output;
68+
die();
69+
?>
70+
*/
71+
72+
// javascript fallback using src files in case this is not run on a PHP server!
73+
var baseURL = document.location.href.replace( /\/test\/.+/, "/"),
74+
files = [
75+
"core",
76+
"callbacks",
77+
"deferred",
78+
"support",
79+
"data",
80+
"queue",
81+
"attributes",
82+
"event",
83+
"sizzle/sizzle",
84+
"sizzle-jquery",
85+
"traversing",
86+
"manipulation",
87+
"css",
88+
"ajax",
89+
"ajax/jsonp",
90+
"ajax/script",
91+
"ajax/xhr",
92+
"effects",
93+
"offset",
94+
"dimensions",
95+
"exports"
96+
],
97+
len = files.length,
98+
i = 0;
99+
100+
for ( ; i < len; i++ ) {
101+
document.write("<script src=\"" + baseURL + "src/" + files[ i ] + ".js\"><"+"/script>");
102+
}

‎test/data/offset/absolute.html‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,7 @@
1515
p.instructions { position: absolute; bottom: 0; }
1616
#positionTest { position: absolute; }
1717
</style>
18-
<script src="../../../src/core.js"></script>
19-
<script src="../../../src/callbacks.js"></script>
20-
<script src="../../../src/deferred.js"></script>
21-
<script src="../../../src/support.js"></script>
22-
<script src="../../../src/sizzle/sizzle.js"></script>
23-
<script src="../../../src/sizzle-jquery.js"></script>
24-
<script src="../../../src/traversing.js"></script>
25-
<script src="../../../src/data.js"></script>
26-
<script src="../../../src/event.js"></script>
27-
<script src="../../../src/css.js"></script>
28-
<script src="../../../src/offset.js"></script>
29-
<script type="text/javascript" src="../../../dist/jquery.js"></script>
18+
<script src="../include_js.php"></script>
3019
<script type="text/javascript" charset="utf-8">
3120
jQuery(function($) {
3221
$('.absolute').click(function() {

‎test/data/offset/body.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,7 @@
88
body { margin: 1px; padding: 5px; }
99
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
1010
</style>
11-
<script src="../../../src/core.js"></script>
12-
<script src="../../../src/callbacks.js"></script>
13-
<script src="../../../src/deferred.js"></script>
14-
<script src="../../../src/support.js"></script>
15-
<script src="../../../src/sizzle/sizzle.js"></script>
16-
<script src="../../../src/sizzle-jquery.js"></script>
17-
<script src="../../../src/traversing.js"></script>
18-
<script src="../../../src/data.js"></script>
19-
<script src="../../../src/event.js"></script>
20-
<script src="../../../src/css.js"></script>
21-
<script src="../../../src/offset.js"></script>
11+
<script src="../include_js.php"></script>
2212
<script type="text/javascript" charset="utf-8">
2313
jQuery(function($) {
2414
$('body').click(function() {

‎test/data/offset/fixed.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,7 @@
1212
#forceScroll { width: 5000px; height: 5000px; }
1313
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
1414
</style>
15-
<script src="../../../src/core.js"></script>
16-
<script src="../../../src/callbacks.js"></script>
17-
<script src="../../../src/deferred.js"></script>
18-
<script src="../../../src/support.js"></script>
19-
<script src="../../../src/sizzle/sizzle.js"></script>
20-
<script src="../../../src/sizzle-jquery.js"></script>
21-
<script src="../../../src/traversing.js"></script>
22-
<script src="../../../src/data.js"></script>
23-
<script src="../../../src/event.js"></script>
24-
<script src="../../../src/css.js"></script>
25-
<script src="../../../src/offset.js"></script>
15+
<script src="../include_js.php"></script>
2616
<script type="text/javascript" charset="utf-8">
2717
jQuery(function($) {
2818
window.scrollTo(1000,1000);

‎test/data/offset/relative.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@
1010
#relative-2 { top: 20px; left: 20px; }
1111
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
1212
</style>
13-
<script src="../../../src/core.js"></script>
14-
<script src="../../../src/callbacks.js"></script>
15-
<script src="../../../src/deferred.js"></script>
16-
<script src="../../../src/support.js"></script>
17-
<script src="../../../src/sizzle/sizzle.js"></script>
18-
<script src="../../../src/sizzle-jquery.js"></script>
19-
<script src="../../../src/traversing.js"></script>
20-
<script src="../../../src/data.js"></script>
21-
<script src="../../../src/event.js"></script>
22-
<script src="../../../src/css.js"></script>
23-
<script src="../../../src/offset.js"></script>
13+
<script src="../include_js.php"></script>
2414
<script type="text/javascript" charset="utf-8">
2515
jQuery(function($) {
2616
$('.relative').click(function() {

‎test/data/offset/scroll.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,7 @@
1313
#forceScroll { width: 5000px; height: 5000px; }
1414
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
1515
</style>
16-
<script src="../../../src/core.js"></script>
17-
<script src="../../../src/callbacks.js"></script>
18-
<script src="../../../src/deferred.js"></script>
19-
<script src="../../../src/support.js"></script>
20-
<script src="../../../src/sizzle/sizzle.js"></script>
21-
<script src="../../../src/sizzle-jquery.js"></script>
22-
<script src="../../../src/traversing.js"></script>
23-
<script src="../../../src/data.js"></script>
24-
<script src="../../../src/event.js"></script>
25-
<script src="../../../src/css.js"></script>
26-
<script src="../../../src/offset.js"></script>
16+
<script src="../include_js.php"></script>
2717
<script type="text/javascript" charset="utf-8">
2818
jQuery(function($) {
2919
window.scrollTo(1000,1000);

‎test/data/offset/static.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@
1010
#static-2 { top: 20px; left: 20px; }
1111
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
1212
</style>
13-
<script src="../../../src/core.js"></script>
14-
<script src="../../../src/callbacks.js"></script>
15-
<script src="../../../src/deferred.js"></script>
16-
<script src="../../../src/support.js"></script>
17-
<script src="../../../src/sizzle/sizzle.js"></script>
18-
<script src="../../../src/sizzle-jquery.js"></script>
19-
<script src="../../../src/traversing.js"></script>
20-
<script src="../../../src/data.js"></script>
21-
<script src="../../../src/event.js"></script>
22-
<script src="../../../src/css.js"></script>
23-
<script src="../../../src/offset.js"></script>
13+
<script src="../include_js.php"></script>
2414
<script type="text/javascript" charset="utf-8">
2515
jQuery(function($) {
2616
$('.static').click(function() {

‎test/data/offset/table.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@
1010
th, td { border: 1px solid #000; width: 100px; height: 100px; }
1111
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
1212
</style>
13-
<script src="../../../src/core.js"></script>
14-
<script src="../../../src/callbacks.js"></script>
15-
<script src="../../../src/deferred.js"></script>
16-
<script src="../../../src/support.js"></script>
17-
<script src="../../../src/sizzle/sizzle.js"></script>
18-
<script src="../../../src/sizzle-jquery.js"></script>
19-
<script src="../../../src/traversing.js"></script>
20-
<script src="../../../src/data.js"></script>
21-
<script src="../../../src/event.js"></script>
22-
<script src="../../../src/css.js"></script>
23-
<script src="../../../src/offset.js"></script>
13+
<script src="../include_js.php"></script>
2414
<script type="text/javascript" charset="utf-8">
2515
jQuery(function($) {
2616
$('table, th, td').click(function() {

‎test/data/selector/html5_selector.html‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,7 @@
44
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
55
<title>jQuery selector - attributes</title>
66

7-
<script src="../../../src/core.js"></script>
8-
<script src="../../../src/callbacks.js"></script>
9-
<script src="../../../src/deferred.js"></script>
10-
<script src="../../../src/support.js"></script>
11-
<script src="../../../src/data.js"></script>
12-
<script src="../../../src/queue.js"></script>
13-
<script src="../../../src/attributes.js"></script>
14-
<script src="../../../src/event.js"></script>
15-
<script src="../../../src/sizzle/sizzle.js"></script>
16-
<script src="../../../src/sizzle-jquery.js"></script>
17-
<script src="../../../src/traversing.js"></script>
18-
<script src="../../../src/manipulation.js"></script>
19-
<script src="../../../src/css.js"></script>
20-
<script src="../../../src/ajax.js"></script>
21-
<script src="../../../src/ajax/jsonp.js"></script>
22-
<script src="../../../src/ajax/script.js"></script>
23-
<script src="../../../src/ajax/xhr.js"></script>
24-
<script src="../../../src/effects.js"></script>
25-
<script src="../../../src/offset.js"></script>
26-
<script src="../../../src/dimensions.js"></script>
7+
<script src="../include_js.php"></script>
278

289
<script id="script1"
2910
defer

0 commit comments

Comments
 (0)