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

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
Brandon Aaron 2010-03-27 18:58:55 -05:00
parent efea0f23f9 dab1d74677
commit d6f03aa0df
4 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/data/testrunner.js
View file

@ -7,5 +7,9 @@ jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
if ( !url || url.indexOf("http") !== 0 ) { if ( !url || url.indexOf("http") !== 0 ) {
return; return;
} }
// (Temporarily) Disable Ajax tests to reduce network strain
isLocal = QUnit.isLocal = true;
document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>"); document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
})(); })();

2
test/unit/core.js
View file

@ -271,7 +271,7 @@ test("isPlainObject", function() {
var doc = iframe.contentDocument || iframe.contentWindow.document; var doc = iframe.contentDocument || iframe.contentWindow.document;
doc.open(); doc.open();
doc.write("<body onload='window.top.iframeDone(Object);'>"); doc.write("<body onload='window.parent.iframeDone(Object);'>");
doc.close(); doc.close();
}); });

22
test/unit/event.js
View file

@ -443,28 +443,28 @@ test("unbind(type)", function() {
} }
message = "unbind passing function"; message = "unbind passing function";
$elem.bind('error', error).unbind('error',error).triggerHandler('error'); $elem.bind('error1', error).unbind('error1',error).triggerHandler('error1');
message = "unbind all from event"; message = "unbind all from event";
$elem.bind('error', error).unbind('error').triggerHandler('error'); $elem.bind('error1', error).unbind('error1').triggerHandler('error1');
message = "unbind all"; message = "unbind all";
$elem.bind('error', error).unbind().triggerHandler('error'); $elem.bind('error1', error).unbind().triggerHandler('error1');
message = "unbind many with function"; message = "unbind many with function";
$elem.bind('error error2',error) $elem.bind('error1 error2',error)
.unbind('error error2', error ) .unbind('error1 error2', error )
.trigger('error').triggerHandler('error2'); .trigger('error1').triggerHandler('error2');
message = "unbind many"; // #3538 message = "unbind many"; // #3538
$elem.bind('error error2',error) $elem.bind('error1 error2',error)
.unbind('error error2') .unbind('error1 error2')
.trigger('error').triggerHandler('error2'); .trigger('error1').triggerHandler('error2');
message = "unbind without a type or handler"; message = "unbind without a type or handler";
$elem.bind("error error2.test",error) $elem.bind("error1 error2.test",error)
.unbind() .unbind()
.trigger("error").triggerHandler("error2"); .trigger("error1").triggerHandler("error2");
}); });
test("unbind(eventObject)", function() { test("unbind(eventObject)", function() {

23
test/unit/offset.js
View file

@ -1,5 +1,7 @@
module("offset"); module("offset");
var supportsScroll = false;
testoffset("absolute"/* in iframe */, function($, iframe) { testoffset("absolute"/* in iframe */, function($, iframe) {
expect(4); expect(4);
@ -10,6 +12,12 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
// if the offset method is using the scroll offset // if the offset method is using the scroll offset
// of the parent window // of the parent window
var forceScroll = jQuery('<div>', { width: 2000, height: 2000 }).appendTo('body'); var forceScroll = jQuery('<div>', { width: 2000, height: 2000 }).appendTo('body');
window.scrollTo(200, 200);
if ( document.documentElement.scrollTop || document.body.scrollTop ) {
supportsScroll = true;
}
window.scrollTo(1, 1); window.scrollTo(1, 1);
// get offset // get offset
@ -256,8 +264,13 @@ testoffset("fixed", function( jQuery ) {
{ id: '#fixed-1', top: 1001, left: 1001 }, { id: '#fixed-1', top: 1001, left: 1001 },
{ id: '#fixed-2', top: 1021, left: 1021 } { id: '#fixed-2', top: 1021, left: 1021 }
]; ];
jQuery.each( tests, function() { jQuery.each( tests, function() {
if ( jQuery.offset.supportsFixedPosition ) { if ( !supportsScroll ) {
ok( true, "Browser doesn't support scroll position." );
ok( true, "Browser doesn't support scroll position." );
} else if ( jQuery.offset.supportsFixedPosition ) {
equals( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" ); equals( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset().top" );
equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" ); equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
} else { } else {
@ -336,11 +349,19 @@ testoffset("scroll", function( jQuery, win ) {
win.name = "test"; win.name = "test";
if ( !supportsScroll ) {
ok( true, "Browser doesn't support scroll position." );
ok( true, "Browser doesn't support scroll position." );
ok( true, "Browser doesn't support scroll position." );
ok( true, "Browser doesn't support scroll position." );
} else {
equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" ); equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" ); equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" ); equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" ); equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
}
// test jQuery using parent window/document // test jQuery using parent window/document
// jQuery reference here is in the iframe // jQuery reference here is in the iframe