Permalink
Browse files

Ref #13316: Sync all documents on full vs. minified source. Close gh-…

  • Loading branch information...
1 parent f3db084 commit 363299ac24aebbf2445207621840f44fcaaf670a @gibson042 gibson042 committed Jan 28, 2013
View
@@ -60,7 +60,7 @@ jQuery.support = (function() {
support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
// Support: Firefox 17+
- // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
+ // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
div.setAttribute( "onfocusin", "t" );
support.focusinBubbles = "onfocusin" in window || div.attributes.onfocusin.expando === false;
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Attempt to block tests because of dangling XHR requests (IE)</title>
-<script type="text/javascript" src="../../../dist/jquery.min.js"></script>
+<script src="../../jquery.js"></script>
<script type="text/javascript">
window.onunload = function() {};
jQuery(function() {
@@ -12,7 +12,7 @@
errors.push( errorMessage );
};
</script>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
</head>
<body>
<script>
@@ -11,7 +11,7 @@
</head>
<body>
<div>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
</div>
</body>
</html>
@@ -15,7 +15,7 @@
</head>
<body>
<div>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
</div>
</body>
</html>
@@ -1,6 +1,6 @@
<!doctype html>
<html>
- <script src="/dist/jquery.js"></script>
+ <script src="../../jquery.js"></script>
<script>
function report( event ) {
var payload = {
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #11470</title>
-<script type="text/javascript" src="../../../dist/jquery.min.js"></script>
+<script src="../../jquery.js"></script>
<script type="text/javascript">
jQuery.when( jQuery.ready ).done(function() {
jQuery("body").append("<div>modifying DOM</div>");
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #10067</title>
-<script type="text/javascript" src="../../../dist/jquery.min.js"></script>
+<script src="../../jquery.js"></script>
</head>
<body>
@@ -6,7 +6,7 @@
</head>
<body>
<div id="qunit-fixture"></div>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script>
var script = document.getElementsByTagName( "script" )[ 0 ],
div = document.createElement( "div" ),
@@ -15,7 +15,7 @@
p.instructions { position: absolute; bottom: 0; }
#positionTest { position: absolute; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('.absolute').click(function() {
@@ -9,7 +9,7 @@
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
#firstElement { width: 50px; height: 50px; background: green; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('body').click(function() {
@@ -12,7 +12,7 @@
#forceScroll { width: 5000px; height: 5000px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
window.scrollTo(1000,1000);
@@ -10,7 +10,7 @@
#relative-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('.relative').click(function() {
@@ -13,7 +13,7 @@
#forceScroll { width: 5000px; height: 5000px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
window.scrollTo(1000,1000);
@@ -10,7 +10,7 @@
#static-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('.static').click(function() {
@@ -10,7 +10,7 @@
th, td { border: 1px solid #000; width: 100px; height: 100px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('table, th, td').click(function() {
@@ -4,7 +4,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>jQuery selector - attributes</title>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
<script id="script1"
defer
@@ -4,18 +4,21 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>jQuery selector - sizzle cache</title>
- <script src="../../../dist/jquery.js"></script>
+ <script src="../../jquery.js"></script>
<script>
- var $cached = jQuery.noConflict(true);
+ document.write(
+ "<script>var $cached = jQuery.noConflict(true);<\x2Fscript>" +
+ "<script src='" + document.getElementById("jquery-js").src + "?overwrite'><\x2Fscript>"
+ );
</script>
- <script src="../../../dist/jquery.min.js"></script>
</head>
<body>
-
<div class="test">
<a href="#" id="collision">Worlds collide</a>
</div>
-
+ <script>
+ window.parent.iframeCallback( $cached, jQuery, document );
+ </script>
</body>
</html>
@@ -17,7 +17,7 @@
</head>
<body>
<div>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
</div>
<script>
jQuery(function() {
View
@@ -0,0 +1,3 @@
+jQuery(function() {
+ parent.iframeCallback( jQuery.support );
+});
@@ -1,14 +1,14 @@
<?php
- header("X-Content-Security-Policy: default-src localhost 'self';");
- header("X-WebKit-CSP: script-src 'self'; style-src 'self' 'unsafe-inline'");
+ header("X-Content-Security-Policy: default-src 'self';");
+ header("X-WebKit-CSP: script-src 'self'");
?>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CSP Test Page</title>
-
- <script src="../dist/jquery.js"></script>
+ <script src="../../jquery.js"></script>
+ <script src="csp.js"></script>
</head>
<body>
<p>CSP Test Page</p>
@@ -12,7 +12,7 @@
</head>
<body>
<div>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
</div>
<script>
jQuery(function() {
@@ -7,7 +7,7 @@
background: url('../1x1.jpg');
}
</style>
- <script src="../../../dist/jquery.min.js"></script>
+ <script src="../../jquery.js"></script>
</head>
<body>
<script>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Event Delegation Tests</title>
-<script src="../dist/jquery.min.js"></script>
+<script src="jquery.js"></script>
<style>
table {
border-collapse: collapse;
View
@@ -1,7 +1,7 @@
<html>
<head>
<title>Hover tests</title>
-<script src="../dist/jquery.min.js"></script>
+<script src="jquery.js"></script>
<style>
/* Remove body dimensions so we can test enter/leave to surrounding browser chrome */
body, html {
View
@@ -41,7 +41,7 @@
}
// Load jQuery
- document.write( "<script src='" + src + "'><\/script>" );
+ document.write( "<script id='jquery-js' src='" + src + "'><\x2Fscript>" );
})();
</script>
<script src="data/testrunner.js"></script>
View
@@ -0,0 +1,5 @@
+// Use the right jQuery source in iframe tests
+document.write( "<script id='jquery-js' src='" +
+ parent.document.getElementById("jquery-js").src.replace( /^(?![^\/?#]+:)/,
+ parent.location.pathname.replace( /[^\/]$/, "$0/" ) ) +
+"'><\x2Fscript>" );
View
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>jQuery Local File Test</title>
<!-- Includes -->
- <script src="../dist/jquery.min.js"></script>
+ <script src="jquery.js"></script>
<style>
.error { color: red; }
.success { color: green; }
View
@@ -15,7 +15,7 @@
<style>
div { margin-top: 10px; }
</style>
- <script src="../dist/jquery.min.js"></script>
+ <script src="jquery.js"></script>
<script type="text/javascript">
$('button').live('click', function () {
$.ajax({
View
@@ -1,110 +0,0 @@
-<?php
- $baseURL = "http://ajax.googleapis.com/ajax/libs/";
- $libraries = array(
- "Dojo" => array(
- "versions" => array( "1.1.1", "1.2.0", "1.2.3", "1.3.0", "1.3.1", "1.3.2", "1.4.0", "1.4.1", "1.4.3", "1.5.0" ),
- "url" => "dojo/XYZ/dojo/dojo.xd.js"
- ),
- "ExtCore" => array(
- "versions" => array( "3.0.0", "3.1.0" ),
- "url" => "ext-core/XYZ/ext-core.js"
- ),
- "jQuery" => array(
- "versions" => array( "1.2.3", "1.2.6", "1.3.0", "1.3.1", "1.3.2", "1.4.0", "1.4.1", "1.4.2", "1.4.3", "1.4.4", "1.5.0" ),
- "url" => "jquery/XYZ/jquery.min.js"
- ),
- "jQueryUI" => array(
- "versions" => array( "1.5.2", "1.5.3", "1.6.0", "1.7.0", "1.7.1", "1.7.2", "1.7.3", "1.8.0", "1.8.1", "1.8.2", "1.8.4", "1.8.5", "1.8.6", "1.8.7", "1.8.8", "1.8.9" ),
- "url" => "jqueryui/XYZ/jquery-ui.min.js"
- ),
- "MooTools" => array(
- "versions" => array( "1.1.1", "1.1.2", "1.2.1", "1.2.2", "1.2.3", "1.2.4", "1.2.5", "1.3.0" ),
- "url" => "mootools/XYZ/mootools-yui-compressed.js"
- ),
- "Prototype" => array(
- "versions" => array( "1.6.0.2", "1.6.0.3", "1.6.1.0", "1.7.0.0" ),
- "url" => "prototype/XYZ/prototype.js"
- ),
- "scriptaculous" => array(
- "versions" => array( "1.8.1", "1.8.2", "1.8.3" ),
- "url" => "scriptaculous/XYZ/scriptaculous.js"
- ),
- "SWFObject" => array(
- "versions" => array( "2.1", "2.2" ),
- "url" => "swfobject/XYZ/swfobject.js"
- ),
- "YUI" => array(
- "versions" => array( "2.6.0", "2.7.0", "2.8.0r4", "2.8.1", "2.8.2", "3.3.0" ),
- "url" => "yui/XYZ/build/yui/yui-min.js"
- )
- );
-
- if( count($_POST) ) {
- $includes = array();
- foreach( $_POST as $name => $ver ){
- if ( empty( $libraries[ $name ] )) {
- echo "unsupported library ". $name;
- exit;
- }
-
- $url = $libraries[ $name ][ "url" ];
- if( $name == "YUI" && $ver[0] == "2" ) {
- $url = str_replace( "/yui", "/yuiloader", $url);
- }
-
- if ( empty( $libraries[ $name ][ "versions" ][ $ver ] )) {
- echo "library ". $name ." not supported in version ". $ver;
- exit;
- }
-
- $include = "<script src='$baseURL".str_replace("XYZ", $ver, $url)."'></script>\n";
- if( $lib == "prototype" ) { // prototype must be included first
- array_unshift( $includes, $include );
- } else {
- array_push( $includes, $include );
- }
- }
-
- $includes = implode( "\n", $includes );
- $suite = file_get_contents( "index.html" );
- echo str_replace( "<!-- Includes -->", $includes, $suite );
- exit;
- }
-?>
-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title>Run jQuery Test Suite Polluted</title>
- <style type="text/css">
- .otherlibs fieldset {
- width: 400px
- }
- .otherlibs label{
- margin: 5px 0px 5px 20px;
- }
- </style>
-</head>
-
-<body id="body">
- <h1 id="header">jQuery Test Suite</h1>
- <h2 id="banner" class="fail"></h2>
- <h2 id="userAgent">Choose other libraries to include</h2>
-
- <form class="otherlibs" action="./polluted.php" method="POST">
- <?php
- foreach( $libraries as $name => $data ) {
- echo "<fieldset><legend>$name</legend>";
- $i = 0;
- foreach( $data[ "versions" ] as $ver ) {
- $i++;
- echo "<label><input type='radio' name='$name' value='$ver' />$ver</label>";
- if( !($i % 4) ) echo "<br />";
- }
- echo "</fieldset>";
- }
- ?>
- <input type="submit" value=" Run " class="submit" />
- </form>
-</body>
-</html>
View
@@ -14,7 +14,7 @@
#output { background-color: green }
#expectedOutput { background-color: green }
</style>
- <script src="../dist/jquery.min.js"></script>
+ <script src="jquery.js"></script>
<!-- Load the script loader that uses
jQuery.readyWait -->
Oops, something went wrong.

1 comment on commit 363299a

Member

markelog commented on 363299a Feb 28, 2013

@gibson042 hey, i guess with this commit we can close 12040?
/cc @dmethvin

Please sign in to comment.