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

…1147.
jquery · Feb 7, 2013 · 363299a · 363299a · markelog · Feb 28, 2013
1 parent f3db084
commit 363299a
Show file tree

Hide file tree

Showing 34 changed files with 58 additions and 168 deletions.
diff --git a/src/support.js b/src/support.js
@@ -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;
 

diff --git a/test/data/ajax/unreleasedXHR.html b/test/data/ajax/unreleasedXHR.html
@@ -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() {

diff --git a/test/data/core/cc_on.html b/test/data/core/cc_on.html
@@ -12,7 +12,7 @@
 			errors.push( errorMessage );
 		};
 	</script>
-	<script src="../../../dist/jquery.min.js"></script>
+	<script src="../../jquery.js"></script>
 </head>
 <body>
 	<script>

diff --git a/test/data/dimensions/documentLarge.html b/test/data/dimensions/documentLarge.html
@@ -11,7 +11,7 @@
 </head>
 <body>
 	<div>
-		<script src="../../../dist/jquery.min.js"></script>
+		<script src="../../jquery.js"></script>
 	</div>
 </body>
 </html>
diff --git a/test/data/dimensions/documentSmall.html b/test/data/dimensions/documentSmall.html
@@ -15,7 +15,7 @@
 </head>
 <body>
 	<div>
-		<script src="../../../dist/jquery.min.js"></script>
+		<script src="../../jquery.js"></script>
 	</div>
 </body>
 </html>
diff --git a/test/data/onbeforeunload.html → test/data/event/onbeforeunload.html b/test/data/onbeforeunload.html → test/data/event/onbeforeunload.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 = {

diff --git a/test/data/event/promiseReady.html b/test/data/event/promiseReady.html
@@ -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>");

diff --git a/test/data/event/syncReady.html b/test/data/event/syncReady.html
@@ -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>
 

diff --git a/test/data/manipulation/iframe-denied.html b/test/data/manipulation/iframe-denied.html
@@ -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" ),

diff --git a/test/data/offset/absolute.html b/test/data/offset/absolute.html
@@ -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() {

diff --git a/test/data/offset/body.html b/test/data/offset/body.html
@@ -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() {

diff --git a/test/data/offset/fixed.html b/test/data/offset/fixed.html
@@ -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);

diff --git a/test/data/offset/relative.html b/test/data/offset/relative.html
@@ -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() {

diff --git a/test/data/offset/scroll.html b/test/data/offset/scroll.html
@@ -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);

diff --git a/test/data/offset/static.html b/test/data/offset/static.html
@@ -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() {

diff --git a/test/data/offset/table.html b/test/data/offset/table.html
@@ -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() {

diff --git a/test/data/selector/html5_selector.html b/test/data/selector/html5_selector.html
@@ -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

diff --git a/test/data/selector/sizzle_cache.html b/test/data/selector/sizzle_cache.html
@@ -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>
diff --git a/test/data/support/bodyBackground.html b/test/data/support/bodyBackground.html
@@ -17,7 +17,7 @@
 </head>
 <body>
 	<div>
-		<script src="../../../dist/jquery.min.js"></script>
+		<script src="../../jquery.js"></script>
 	</div>
 	<script>
 		jQuery(function() {

diff --git a/test/data/support/csp.js b/test/data/support/csp.js
@@ -0,0 +1,3 @@
+jQuery(function() {
+	parent.iframeCallback( jQuery.support );
+});
diff --git a/test/csp.php → test/data/support/csp.php b/test/csp.php → test/data/support/csp.php
@@ -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>

diff --git a/test/data/support/shrinkWrapBlocks.html b/test/data/support/shrinkWrapBlocks.html
@@ -12,7 +12,7 @@
 </head>
 <body>
 	<div>
-		<script src="../../../dist/jquery.min.js"></script>
+		<script src="../../jquery.js"></script>
 	</div>
 	<script>
 		jQuery(function() {

diff --git a/test/data/support/testElementCrash.html b/test/data/support/testElementCrash.html
@@ -7,7 +7,7 @@
 			background: url('../1x1.jpg');
 		}
 	</style>
-	<script src="../../../dist/jquery.min.js"></script>
+	<script src="../../jquery.js"></script>
 </head>
 <body>
 	<script>

diff --git a/test/delegatetest.html b/test/delegatetest.html
@@ -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;

diff --git a/test/hovertest.html b/test/hovertest.html
@@ -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 {

diff --git a/test/index.html b/test/index.html
@@ -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>

diff --git a/test/jquery.js b/test/jquery.js
@@ -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>" );
diff --git a/test/localfile.html b/test/localfile.html
@@ -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; }

diff --git a/test/networkerror.html b/test/networkerror.html
@@ -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({

diff --git a/test/polluted.php b/test/polluted.php
diff --git a/test/readywait.html b/test/readywait.html
@@ -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 -->