Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'fix8033' of https://github.com/SlexAxton/jquery into Sl…

…exAxton-fix8033
  • Loading branch information...
commit 3ad8dd242acec1066f43a9349f4c1a352680d37b 2 parents 6597733 + c50b743
@jeresig jeresig authored
View
2  src/core.js
@@ -1076,6 +1076,6 @@ function doScrollCheck() {
}
// Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
+return jQuery;
})();
View
1  src/outro.js
@@ -1 +1,2 @@
+window.jQuery = window.$ = jQuery;
})(window);
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>

0 comments on commit 3ad8dd2

Please sign in to comment.
Something went wrong with that request. Please try again.