Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moved jQuery global leak to end of file so accidental gEBCN overrides…

… in prototype don't get caught up in confusion. Fixed tests to reference jQuery variable instead of $ (best practice). Fixes #8033
  • Loading branch information...
commit c50b74372c398b0c85164ad01977c5118b55d418 1 parent 02ca455
@SlexAxton authored
View
2  src/core.js
@@ -1054,6 +1054,6 @@ function doScrollCheck() {
}
// Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
+return jQuery;
@ghazel
ghazel added a note

This moves the code, but not the comment. (see below)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
})();
View
1  src/outro.js
@@ -1 +1,2 @@
+window.jQuery = window.$ = jQuery;
@ghazel
ghazel added a note

Now there's no comment here, as there was on previous versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
})(window);
@ghazel
ghazel added a note

Now there's no comment here, as there was on previous versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
View
2  test/data/offset/absolute.html
@@ -26,7 +26,7 @@
<script src="../../../src/offset.js"></script>
<script type="text/javascript" src="../../../dist/jquery.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
$('.absolute').click(function() {
$('#marker').css( $(this).offset() );
var pos = $(this).position();
View
4 test/data/offset/body.html
@@ -18,7 +18,7 @@
<script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
$('body').click(function() {
$('#marker').css( $(this).offset() );
return false;
@@ -29,4 +29,4 @@
<body>
<div id="marker"></div>
</body>
-</html>
+</html>
View
4 test/data/offset/fixed.html
@@ -22,7 +22,7 @@
<script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
window.scrollTo(1000,1000);
$('.fixed').click(function() {
$('#marker').css( $(this).offset() );
@@ -38,4 +38,4 @@
<div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it.</p>
</body>
-</html>
+</html>
View
4 test/data/offset/relative.html
@@ -20,7 +20,7 @@
<script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
$('.relative').click(function() {
$('#marker').css( $(this).offset() );
var pos = $(this).position();
@@ -36,4 +36,4 @@
<div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it. Clicking the box also changes the position to absolute (if not already) and sets the position according to the position method.</p>
</body>
-</html>
+</html>
View
4 test/data/offset/scroll.html
@@ -23,7 +23,7 @@
<script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
window.scrollTo(1000,1000);
$('#scroll-1')[0].scrollLeft = 5;
$('#scroll-1')[0].scrollTop = 5;
@@ -44,4 +44,4 @@
<div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it.</p>
</body>
-</html>
+</html>
View
4 test/data/offset/static.html
@@ -20,7 +20,7 @@
<script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
$('.static').click(function() {
$('#marker').css( $(this).offset() );
var pos = $(this).position();
@@ -36,4 +36,4 @@
<div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it. Clicking the box also changes the position to absolute (if not already) and sets the position according to the position method.</p>
</body>
-</html>
+</html>
View
4 test/data/offset/table.html
@@ -20,7 +20,7 @@
<script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8">
- $(function() {
+ jQuery(function($) {
$('table, th, td').click(function() {
$('#marker').css( $(this).offset() );
return false;
@@ -48,4 +48,4 @@
<div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it.</p>
</body>
-</html>
+</html>
Please sign in to comment.
Something went wrong with that request. Please try again.