Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Ref #13316: Sync all documents on full vs. minified source. Close gh-…
  • Loading branch information
gibson042 committed Feb 7, 2013
1 parent f3db084 commit 363299a
Show file tree
Hide file tree
Showing 34 changed files with 58 additions and 168 deletions.
2 changes: 1 addition & 1 deletion src/support.js
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion test/data/ajax/unreleasedXHR.html
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/core/cc_on.html
Expand Up @@ -12,7 +12,7 @@
errors.push( errorMessage );
};
</script>
<script src="../../../dist/jquery.min.js"></script>
<script src="../../jquery.js"></script>
</head>
<body>
<script>
Expand Down
2 changes: 1 addition & 1 deletion test/data/dimensions/documentLarge.html
Expand Up @@ -11,7 +11,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.min.js"></script>
<script src="../../jquery.js"></script>
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion test/data/dimensions/documentSmall.html
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion test/data/event/promiseReady.html
Expand Up @@ -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>");
Expand Down
2 changes: 1 addition & 1 deletion test/data/event/syncReady.html
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/data/manipulation/iframe-denied.html
Expand Up @@ -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" ),
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/absolute.html
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/body.html
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/fixed.html
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/relative.html
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/scroll.html
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/static.html
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/offset/table.html
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/selector/html5_selector.html
Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions test/data/selector/sizzle_cache.html
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion test/data/support/bodyBackground.html
Expand Up @@ -17,7 +17,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.min.js"></script>
<script src="../../jquery.js"></script>
</div>
<script>
jQuery(function() {
Expand Down
3 changes: 3 additions & 0 deletions test/data/support/csp.js
@@ -0,0 +1,3 @@
jQuery(function() {
parent.iframeCallback( jQuery.support );
});
8 changes: 4 additions & 4 deletions 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>
Expand Down
2 changes: 1 addition & 1 deletion test/data/support/shrinkWrapBlocks.html
Expand Up @@ -12,7 +12,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.min.js"></script>
<script src="../../jquery.js"></script>
</div>
<script>
jQuery(function() {
Expand Down
2 changes: 1 addition & 1 deletion test/data/support/testElementCrash.html
Expand Up @@ -7,7 +7,7 @@
background: url('../1x1.jpg');
}
</style>
<script src="../../../dist/jquery.min.js"></script>
<script src="../../jquery.js"></script>
</head>
<body>
<script>
Expand Down
2 changes: 1 addition & 1 deletion test/delegatetest.html
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion 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 {
Expand Down
2 changes: 1 addition & 1 deletion test/index.html
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions 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>" );
2 changes: 1 addition & 1 deletion test/localfile.html
Expand Up @@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion test/networkerror.html
Expand Up @@ -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({
Expand Down
110 changes: 0 additions & 110 deletions test/polluted.php

This file was deleted.

2 changes: 1 addition & 1 deletion test/readywait.html
Expand Up @@ -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 -->
Expand Down

1 comment on commit 363299a

@markelog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.