deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
jeresig 2011-02-14 12:35:27 -05:00
parent 659773348f c50b74372c
commit 3ad8dd242a
9 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.js
View file

@ -1076,6 +1076,6 @@ function doScrollCheck() {
} }
// Expose jQuery to the global object // Expose jQuery to the global object
return (window.jQuery = window.$ = jQuery); return jQuery;
})(); })();

1
src/outro.js
View file

@ -1 +1,2 @@
window.jQuery = window.$ = jQuery;
})(window); })(window);

2
test/data/offset/absolute.html
View file

@ -26,7 +26,7 @@
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" src="../../../dist/jquery.js"></script> <script type="text/javascript" src="../../../dist/jquery.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
$('.absolute').click(function() { $('.absolute').click(function() {
$('#marker').css( $(this).offset() ); $('#marker').css( $(this).offset() );
var pos = $(this).position(); var pos = $(this).position();

4
test/data/offset/body.html
View file

@ -18,7 +18,7 @@
<script src="../../../src/css.js"></script> <script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
$('body').click(function() { $('body').click(function() {
$('#marker').css( $(this).offset() ); $('#marker').css( $(this).offset() );
return false; return false;
@ -29,4 +29,4 @@
<body> <body>
<div id="marker"></div> <div id="marker"></div>
</body> </body>
</html> </html>

4
test/data/offset/fixed.html
View file

@ -22,7 +22,7 @@
<script src="../../../src/css.js"></script> <script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
window.scrollTo(1000,1000); window.scrollTo(1000,1000);
$('.fixed').click(function() { $('.fixed').click(function() {
$('#marker').css( $(this).offset() ); $('#marker').css( $(this).offset() );
@ -38,4 +38,4 @@
<div id="marker"></div> <div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it.</p> <p class="instructions">Click the white box to move the marker to it.</p>
</body> </body>
</html> </html>

4
test/data/offset/relative.html
View file

@ -20,7 +20,7 @@
<script src="../../../src/css.js"></script> <script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
$('.relative').click(function() { $('.relative').click(function() {
$('#marker').css( $(this).offset() ); $('#marker').css( $(this).offset() );
var pos = $(this).position(); var pos = $(this).position();
@ -36,4 +36,4 @@
<div id="marker"></div> <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> <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> </body>
</html> </html>

4
test/data/offset/scroll.html
View file

@ -23,7 +23,7 @@
<script src="../../../src/css.js"></script> <script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
window.scrollTo(1000,1000); window.scrollTo(1000,1000);
$('#scroll-1')[0].scrollLeft = 5; $('#scroll-1')[0].scrollLeft = 5;
$('#scroll-1')[0].scrollTop = 5; $('#scroll-1')[0].scrollTop = 5;
@ -44,4 +44,4 @@
<div id="marker"></div> <div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it.</p> <p class="instructions">Click the white box to move the marker to it.</p>
</body> </body>
</html> </html>

4
test/data/offset/static.html
View file

@ -20,7 +20,7 @@
<script src="../../../src/css.js"></script> <script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
$('.static').click(function() { $('.static').click(function() {
$('#marker').css( $(this).offset() ); $('#marker').css( $(this).offset() );
var pos = $(this).position(); var pos = $(this).position();
@ -36,4 +36,4 @@
<div id="marker"></div> <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> <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> </body>
</html> </html>

4
test/data/offset/table.html
View file

@ -20,7 +20,7 @@
<script src="../../../src/css.js"></script> <script src="../../../src/css.js"></script>
<script src="../../../src/offset.js"></script> <script src="../../../src/offset.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(function() { jQuery(function($) {
$('table, th, td').click(function() { $('table, th, td').click(function() {
$('#marker').css( $(this).offset() ); $('#marker').css( $(this).offset() );
return false; return false;
@ -48,4 +48,4 @@
<div id="marker"></div> <div id="marker"></div>
<p class="instructions">Click the white box to move the marker to it.</p> <p class="instructions">Click the white box to move the marker to it.</p>
</body> </body>
</html> </html>