Skip to content

J
jquery
Commit 3aa46725 authored by timmywil's avatar timmywil
Browse files
Options

Merge branch 'qunit_fixture'

parents 21c0be84 68cc3ad7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 170 deletions
src/effects.js
View file @ 3aa46725
...@@ -173,7 +173,7 @@ jQuery.fn.extend({ ...@@ -173,7 +173,7 @@ jQuery.fn.extend({
this.style.display = "inline-block"; this.style.display = "inline-block";
} else { } else {
var display = defaultDisplay(this.nodeName); display = defaultDisplay(this.nodeName);
// inline-level elements accept inline-block; // inline-level elements accept inline-block;
// block-level elements need to be inline with layout // block-level elements need to be inline with layout
...@@ -274,6 +274,27 @@ jQuery.fn.extend({ ...@@ -274,6 +274,27 @@ jQuery.fn.extend({
}); });
// Animations created synchronously will run synchronously
function createFxNow() {
setTimeout( clearFxNow, 0 );
return ( fxNow = jQuery.now() );
}
function clearFxNow() {
fxNow = undefined;
}
// Generate parameters to create a standard animation
function genFx( type, num ) {
var obj = {};
jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
obj[ this ] = type;
});
return obj;
}
// Generate shortcuts for custom animations // Generate shortcuts for custom animations
jQuery.each({ jQuery.each({
slideDown: genFx("show", 1), slideDown: genFx("show", 1),
...@@ -589,25 +610,4 @@ function defaultDisplay( nodeName ) { ...@@ -589,25 +610,4 @@ function defaultDisplay( nodeName ) {
return elemdisplay[ nodeName ]; return elemdisplay[ nodeName ];
} }
// Animations created synchronously will run synchronously
function createFxNow() {
setTimeout( clearFxNow, 0 );
return ( fxNow = jQuery.now() );
}
function clearFxNow() {
fxNow = undefined;
}
// Generate parameters to create a standard animation
function genFx( type, num ) {
var obj = {};
jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
obj[ this ] = type;
});
return obj;
}
})( jQuery ); })( jQuery );
test/index.html
View file @ 3aa46725
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
<div id="nothiddendiv" style="height:1px;background:white;" class="nothiddendiv"> <div id="nothiddendiv" style="height:1px;background:white;" class="nothiddendiv">
<div id="nothiddendivchild"></div> <div id="nothiddendivchild"></div>
</div> </div>
<!-- this iframe is outside the #main so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves --> <!-- this iframe is outside the #qunit-fixture so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves -->
<iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe> <iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe>
<dl id="dl" style="position:absolute;top:-32767px;left:-32767px;"> <dl id="dl" style="position:absolute;top:-32767px;left:-32767px;width:1px">
<div id="main"> <div id="qunit-fixture">
<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p> <p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
<p id="ap"> <p id="ap">
Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>, Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>,
......
qunit @ 69925bca
Subproject commit d404faf8f587fcbe6b8907943022e6318dd51e0c Subproject commit 69925bca552c1e227a93102dcfba9c8596a2e8ce
test/unit/ajax.js
View file @ 3aa46725
...@@ -1782,7 +1782,7 @@ test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() { ...@@ -1782,7 +1782,7 @@ test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() {
passed++; passed++;
if ( passed == 2 ) { if ( passed == 2 ) {
ok( true, "Check local and global callbacks after timeout" ); ok( true, "Check local and global callbacks after timeout" );
jQuery("#main").unbind("ajaxError"); jQuery("#qunit-fixture").unbind("ajaxError");
start(); start();
} }
}; };
...@@ -1792,7 +1792,7 @@ test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() { ...@@ -1792,7 +1792,7 @@ test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() {
start(); start();
}; };
jQuery("#main").ajaxError(pass); jQuery("#qunit-fixture").ajaxError(pass);
jQuery.ajax({ jQuery.ajax({
type: "GET", type: "GET",
......
test/unit/attributes.js
View file @ 3aa46725
...@@ -108,7 +108,7 @@ test("attr(String)", function() { ...@@ -108,7 +108,7 @@ test("attr(String)", function() {
equals( jQuery("#area1").attr("maxLength"), "30", "Check for maxLength attribute" ); equals( jQuery("#area1").attr("maxLength"), "30", "Check for maxLength attribute" );
// using innerHTML in IE causes href attribute to be serialized to the full path // using innerHTML in IE causes href attribute to be serialized to the full path
jQuery("<a/>").attr({ "id": "tAnchor5", "href": "#5" }).appendTo("#main"); jQuery("<a/>").attr({ "id": "tAnchor5", "href": "#5" }).appendTo("#qunit-fixture");
equals( jQuery("#tAnchor5").attr("href"), "#5", "Check for non-absolute href (an anchor)" ); equals( jQuery("#tAnchor5").attr("href"), "#5", "Check for non-absolute href (an anchor)" );
// list attribute is readonly by default in browsers that support it // list attribute is readonly by default in browsers that support it
...@@ -599,7 +599,7 @@ test("val(Function) with incoming value", function() { ...@@ -599,7 +599,7 @@ test("val(Function) with incoming value", function() {
test("val(select) after form.reset() (Bug #2551)", function() { test("val(select) after form.reset() (Bug #2551)", function() {
expect(3); expect(3);
jQuery("<form id='kk' name='kk'><select id='kkk'><option value='cf'>cf</option><option value='gf'>gf</option></select></form>").appendTo("#main"); jQuery("<form id='kk' name='kk'><select id='kkk'><option value='cf'>cf</option><option value='gf'>gf</option></select></form>").appendTo("#qunit-fixture");
jQuery("#kkk").val( "gf" ); jQuery("#kkk").val( "gf" );
......
test/unit/core.js
View file @ 3aa46725
...@@ -29,7 +29,7 @@ test("jQuery()", function() { ...@@ -29,7 +29,7 @@ test("jQuery()", function() {
equals( jQuery(window).length, 1, "Correct number of elements generated for jQuery(window)" ); equals( jQuery(window).length, 1, "Correct number of elements generated for jQuery(window)" );
var main = jQuery("#main"); var main = jQuery("#qunit-fixture");
same( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" ); same( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
/* /*
...@@ -115,54 +115,54 @@ test("selector state", function() { ...@@ -115,54 +115,54 @@ test("selector state", function() {
equals( test.selector, "", "Body Selector" ); equals( test.selector, "", "Body Selector" );
equals( test.context, document.body, "Body Context" ); equals( test.context, document.body, "Body Context" );
test = jQuery("#main"); test = jQuery("#qunit-fixture");
equals( test.selector, "#main", "#main Selector" ); equals( test.selector, "#qunit-fixture", "#qunit-fixture Selector" );
equals( test.context, document, "#main Context" ); equals( test.context, document, "#qunit-fixture Context" );
test = jQuery("#notfoundnono"); test = jQuery("#notfoundnono");
equals( test.selector, "#notfoundnono", "#notfoundnono Selector" ); equals( test.selector, "#notfoundnono", "#notfoundnono Selector" );
equals( test.context, document, "#notfoundnono Context" ); equals( test.context, document, "#notfoundnono Context" );
test = jQuery("#main", document); test = jQuery("#qunit-fixture", document);
equals( test.selector, "#main", "#main Selector" ); equals( test.selector, "#qunit-fixture", "#qunit-fixture Selector" );
equals( test.context, document, "#main Context" ); equals( test.context, document, "#qunit-fixture Context" );
test = jQuery("#main", document.body); test = jQuery("#qunit-fixture", document.body);
equals( test.selector, "#main", "#main Selector" ); equals( test.selector, "#qunit-fixture", "#qunit-fixture Selector" );
equals( test.context, document.body, "#main Context" ); equals( test.context, document.body, "#qunit-fixture Context" );
// Test cloning // Test cloning
test = jQuery(test); test = jQuery(test);
equals( test.selector, "#main", "#main Selector" ); equals( test.selector, "#qunit-fixture", "#qunit-fixture Selector" );
equals( test.context, document.body, "#main Context" ); equals( test.context, document.body, "#qunit-fixture Context" );
test = jQuery(document.body).find("#main"); test = jQuery(document.body).find("#qunit-fixture");
equals( test.selector, "#main", "#main find Selector" ); equals( test.selector, "#qunit-fixture", "#qunit-fixture find Selector" );
equals( test.context, document.body, "#main find Context" ); equals( test.context, document.body, "#qunit-fixture find Context" );
test = jQuery("#main").filter("div"); test = jQuery("#qunit-fixture").filter("div");
equals( test.selector, "#main.filter(div)", "#main filter Selector" ); equals( test.selector, "#qunit-fixture.filter(div)", "#qunit-fixture filter Selector" );
equals( test.context, document, "#main filter Context" ); equals( test.context, document, "#qunit-fixture filter Context" );
test = jQuery("#main").not("div"); test = jQuery("#qunit-fixture").not("div");
equals( test.selector, "#main.not(div)", "#main not Selector" ); equals( test.selector, "#qunit-fixture.not(div)", "#qunit-fixture not Selector" );
equals( test.context, document, "#main not Context" ); equals( test.context, document, "#qunit-fixture not Context" );
test = jQuery("#main").filter("div").not("div"); test = jQuery("#qunit-fixture").filter("div").not("div");
equals( test.selector, "#main.filter(div).not(div)", "#main filter, not Selector" ); equals( test.selector, "#qunit-fixture.filter(div).not(div)", "#qunit-fixture filter, not Selector" );
equals( test.context, document, "#main filter, not Context" ); equals( test.context, document, "#qunit-fixture filter, not Context" );
test = jQuery("#main").filter("div").not("div").end(); test = jQuery("#qunit-fixture").filter("div").not("div").end();
equals( test.selector, "#main.filter(div)", "#main filter, not, end Selector" ); equals( test.selector, "#qunit-fixture.filter(div)", "#qunit-fixture filter, not, end Selector" );
equals( test.context, document, "#main filter, not, end Context" ); equals( test.context, document, "#qunit-fixture filter, not, end Context" );
test = jQuery("#main").parent("body"); test = jQuery("#qunit-fixture").parent("body");
equals( test.selector, "#main.parent(body)", "#main parent Selector" ); equals( test.selector, "#qunit-fixture.parent(body)", "#qunit-fixture parent Selector" );
equals( test.context, document, "#main parent Context" ); equals( test.context, document, "#qunit-fixture parent Context" );
test = jQuery("#main").eq(0); test = jQuery("#qunit-fixture").eq(0);
equals( test.selector, "#main.slice(0,1)", "#main eq Selector" ); equals( test.selector, "#qunit-fixture.slice(0,1)", "#qunit-fixture eq Selector" );
equals( test.context, document, "#main eq Context" ); equals( test.context, document, "#qunit-fixture eq Context" );
var d = "<div />"; var d = "<div />";
equals( equals(
...@@ -228,7 +228,7 @@ test("noConflict", function() { ...@@ -228,7 +228,7 @@ test("noConflict", function() {
equals( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" ); equals( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
equals( jQuery, originaljQuery, "Make sure jQuery was reverted." ); equals( jQuery, originaljQuery, "Make sure jQuery was reverted." );
equals( $, original$, "Make sure $ was reverted." ); equals( $, original$, "Make sure $ was reverted." );
ok( $$("#main").html("test"), "Make sure that jQuery still works." ); ok( $$("#qunit-fixture").html("test"), "Make sure that jQuery still works." );
jQuery = $$; jQuery = $$;
}); });
...@@ -571,29 +571,29 @@ test("end()", function() { ...@@ -571,29 +571,29 @@ test("end()", function() {
test("length", function() { test("length", function() {
expect(1); expect(1);
equals( jQuery("#main p").length, 6, "Get Number of Elements Found" ); equals( jQuery("#qunit-fixture p").length, 6, "Get Number of Elements Found" );
}); });
test("size()", function() { test("size()", function() {
expect(1); expect(1);
equals( jQuery("#main p").size(), 6, "Get Number of Elements Found" ); equals( jQuery("#qunit-fixture p").size(), 6, "Get Number of Elements Found" );
}); });
test("get()", function() { test("get()", function() {
expect(1); expect(1);
same( jQuery("#main p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" ); same( jQuery("#qunit-fixture p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" );
}); });
test("toArray()", function() { test("toArray()", function() {
expect(1); expect(1);
same( jQuery("#main p").toArray(), same( jQuery("#qunit-fixture p").toArray(),
q("firstp","ap","sndp","en","sap","first"), q("firstp","ap","sndp","en","sap","first"),
"Convert jQuery object to an Array" ) "Convert jQuery object to an Array" )
}) })
test("get(Number)", function() { test("get(Number)", function() {
expect(2); expect(2);
equals( jQuery("#main p").get(0), document.getElementById("firstp"), "Get A Single Element" ); equals( jQuery("#qunit-fixture p").get(0), document.getElementById("firstp"), "Get A Single Element" );
strictEqual( jQuery("#firstp").get(1), undefined, "Try get with index larger elements count" ); strictEqual( jQuery("#firstp").get(1), undefined, "Try get with index larger elements count" );
}); });
......
test/unit/css.js
View file @ 3aa46725
...@@ -3,7 +3,7 @@ module("css", { teardown: moduleTeardown }); ...@@ -3,7 +3,7 @@ module("css", { teardown: moduleTeardown });
test("css(String|Hash)", function() { test("css(String|Hash)", function() {
expect( 42 ); expect( 42 );
equals( jQuery("#main").css("display"), "block", "Check for css property \"display\""); equals( jQuery("#qunit-fixture").css("display"), "block", "Check for css property \"display\"");
ok( jQuery("#nothiddendiv").is(":visible"), "Modifying CSS display: Assert element is visible"); ok( jQuery("#nothiddendiv").is(":visible"), "Modifying CSS display: Assert element is visible");
jQuery("#nothiddendiv").css({display: "none"}); jQuery("#nothiddendiv").css({display: "none"});
......
test/unit/data.js
View file @ 3aa46725
...@@ -316,7 +316,7 @@ test("data-* attributes", function() { ...@@ -316,7 +316,7 @@ test("data-* attributes", function() {
div.remove(); div.remove();
child.appendTo("#main"); child.appendTo("#qunit-fixture");
equals( child.data("myobj"), "old data", "Value accessed from data-* attribute"); equals( child.data("myobj"), "old data", "Value accessed from data-* attribute");
child.data("myobj", "replaced"); child.data("myobj", "replaced");
...@@ -406,7 +406,7 @@ test("data-* attributes", function() { ...@@ -406,7 +406,7 @@ test("data-* attributes", function() {
} }
var metadata = "<ol><li class='test test2' data-foo='bar' data-bar='baz' data-arr='[1,2]'>Some stuff</li><li class='test test2' data-test='bar' data-bar='baz'>Some stuff</li><li class='test test2' data-zoooo='bar' data-bar='{\"test\":\"baz\"}'>Some stuff</li><li class='test test2' data-number=true data-stuff='[2,8]'>Some stuff</li></ol>", var metadata = "<ol><li class='test test2' data-foo='bar' data-bar='baz' data-arr='[1,2]'>Some stuff</li><li class='test test2' data-test='bar' data-bar='baz'>Some stuff</li><li class='test test2' data-zoooo='bar' data-bar='{\"test\":\"baz\"}'>Some stuff</li><li class='test test2' data-number=true data-stuff='[2,8]'>Some stuff</li></ol>",
elem = jQuery(metadata).appendTo("#main"); elem = jQuery(metadata).appendTo("#qunit-fixture");
elem.find("li").each(testData); elem.find("li").each(testData);
elem.remove(); elem.remove();
......
test/unit/effects.js
View file @ 3aa46725
...@@ -2,7 +2,7 @@ module("effects", { teardown: moduleTeardown }); ...@@ -2,7 +2,7 @@ module("effects", { teardown: moduleTeardown });
test("sanity check", function() { test("sanity check", function() {
expect(1); expect(1);
ok( jQuery("#dl:visible, #main:visible, #foo:visible").length === 3, "QUnit state is correct for testing effects" ); ok( jQuery("#dl:visible, #qunit-fixture:visible, #foo:visible").length === 3, "QUnit state is correct for testing effects" );
}); });
test("show()", function() { test("show()", function() {
...@@ -14,7 +14,7 @@ test("show()", function() { ...@@ -14,7 +14,7 @@ test("show()", function() {
equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." ); equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );
var div = jQuery("<div>").hide().appendTo("#main").show(); var div = jQuery("<div>").hide().appendTo("#qunit-fixture").show();
equal( div.css("display"), "block", "Make sure pre-hidden divs show" ); equal( div.css("display"), "block", "Make sure pre-hidden divs show" );
...@@ -32,7 +32,7 @@ test("show()", function() { ...@@ -32,7 +32,7 @@ test("show()", function() {
hiddendiv.css("display",""); hiddendiv.css("display","");
var pass = true, div = jQuery("#main div"); var pass = true, div = jQuery("#qunit-fixture div");
div.show().each(function(){ div.show().each(function(){
if ( this.style.display == "none" ) pass = false; if ( this.style.display == "none" ) pass = false;
}); });
...@@ -62,7 +62,7 @@ test("show()", function() { ...@@ -62,7 +62,7 @@ test("show()", function() {
}); });
// #show-tests * is set display: none in CSS // #show-tests * is set display: none in CSS
jQuery("#main").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>"); jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
var old = jQuery("#test-table").show().css("display") !== "table"; var old = jQuery("#test-table").show().css("display") !== "table";
jQuery("#test-table").remove(); jQuery("#test-table").remove();
...@@ -100,7 +100,7 @@ test("show(Number) - other displays", function() { ...@@ -100,7 +100,7 @@ test("show(Number) - other displays", function() {
stop(); stop();
// #show-tests * is set display: none in CSS // #show-tests * is set display: none in CSS
jQuery("#main").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>"); jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
var old = jQuery("#test-table").show().css("display") !== "table", var old = jQuery("#test-table").show().css("display") !== "table",
num = 0; num = 0;
...@@ -142,7 +142,7 @@ test("Persist correct display value", function() { ...@@ -142,7 +142,7 @@ test("Persist correct display value", function() {
stop(); stop();
// #show-tests * is set display: none in CSS // #show-tests * is set display: none in CSS
jQuery("#main").append("<div id='show-tests'><span style='position:absolute;'>foo</span></div>"); jQuery("#qunit-fixture").append("<div id='show-tests'><span style='position:absolute;'>foo</span></div>");
var $span = jQuery("#show-tests span"), var $span = jQuery("#show-tests span"),
displayNone = $span.css("display"), displayNone = $span.css("display"),
...@@ -585,7 +585,7 @@ jQuery.checkOverflowDisplay = function(){ ...@@ -585,7 +585,7 @@ jQuery.checkOverflowDisplay = function(){
} }
test( "jQuery.fx.prototype.cur()", 6, function() { test( "jQuery.fx.prototype.cur()", 6, function() {
var div = jQuery( "<div></div>" ).appendTo( "#main" ).css({ var div = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" ).css({
color: "#ABC", color: "#ABC",
border: "5px solid black", border: "5px solid black",
left: "auto", left: "auto",
...@@ -958,7 +958,7 @@ test("hide hidden elements (bug #7141)", function() { ...@@ -958,7 +958,7 @@ test("hide hidden elements (bug #7141)", function() {
expect(3); expect(3);
QUnit.reset(); QUnit.reset();
var div = jQuery("<div style='display:none'></div>").appendTo("#main"); var div = jQuery("<div style='display:none'></div>").appendTo("#qunit-fixture");
equals( div.css("display"), "none", "Element is hidden by default" ); equals( div.css("display"), "none", "Element is hidden by default" );
div.hide(); div.hide();
ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" ); ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
...@@ -973,7 +973,7 @@ test("hide hidden elements, with animation (bug #7141)", function() { ...@@ -973,7 +973,7 @@ test("hide hidden elements, with animation (bug #7141)", function() {
QUnit.reset(); QUnit.reset();
stop(); stop();
var div = jQuery("<div style='display:none'></div>").appendTo("#main"); var div = jQuery("<div style='display:none'></div>").appendTo("#qunit-fixture");
equals( div.css("display"), "none", "Element is hidden by default" ); equals( div.css("display"), "none", "Element is hidden by default" );
div.hide(1, function () { div.hide(1, function () {
ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" ); ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
...@@ -986,7 +986,7 @@ test("hide hidden elements, with animation (bug #7141)", function() { ...@@ -986,7 +986,7 @@ test("hide hidden elements, with animation (bug #7141)", function() {
test("animate unit-less properties (#4966)", 2, function() { test("animate unit-less properties (#4966)", 2, function() {
stop(); stop();
var div = jQuery( "<div style='z-index: 0; position: absolute;'></div>" ).appendTo( "#main" ); var div = jQuery( "<div style='z-index: 0; position: absolute;'></div>" ).appendTo( "#qunit-fixture" );
equal( div.css( "z-index" ), "0", "z-index is 0" ); equal( div.css( "z-index" ), "0", "z-index is 0" );
div.animate({ zIndex: 2 }, function() { div.animate({ zIndex: 2 }, function() {
equal( div.css( "z-index" ), "2", "z-index is 2" ); equal( div.css( "z-index" ), "2", "z-index is 2" );
......
test/unit/event.js
View file @ 3aa46725
...@@ -169,7 +169,7 @@ test("bind(), namespace with special add", function() { ...@@ -169,7 +169,7 @@ test("bind(), namespace with special add", function() {
}); });
// Should trigger 2 // Should trigger 2
div.appendTo("#main").remove(); div.appendTo("#qunit-fixture").remove();
delete jQuery.event.special.test; delete jQuery.event.special.test;
}); });
...@@ -307,7 +307,7 @@ test("live/delegate immediate propagation", function() { ...@@ -307,7 +307,7 @@ test("live/delegate immediate propagation", function() {
test("bind/delegate bubbling, isDefaultPrevented", function() { test("bind/delegate bubbling, isDefaultPrevented", function() {
expect(2); expect(2);
var $anchor2 = jQuery( "#anchor2" ), var $anchor2 = jQuery( "#anchor2" ),
$main = jQuery( "#main" ), $main = jQuery( "#qunit-fixture" ),
fakeClick = function($jq) { fakeClick = function($jq) {
// Use a native click so we don't get jQuery simulated bubbling // Use a native click so we don't get jQuery simulated bubbling
if ( document.createEvent ) { if ( document.createEvent ) {
...@@ -415,7 +415,7 @@ test("bind(), namespaced events, cloned events", 18, function() { ...@@ -415,7 +415,7 @@ test("bind(), namespaced events, cloned events", 18, function() {
}).trigger("tester"); }).trigger("tester");
// Make sure events stick with appendTo'd elements (which are cloned) #2027 // Make sure events stick with appendTo'd elements (which are cloned) #2027
jQuery("<a href='#fail' class='test'>test</a>").click(function(){ return false; }).appendTo("#main"); jQuery("<a href='#fail' class='test'>test</a>").click(function(){ return false; }).appendTo("#qunit-fixture");
ok( jQuery("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" ); ok( jQuery("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" );
}); });
...@@ -538,7 +538,7 @@ test("bind(name, false), unbind(name, false)", function() { ...@@ -538,7 +538,7 @@ test("bind(name, false), unbind(name, false)", function() {
expect(3); expect(3);
var main = 0; var main = 0;
jQuery("#main").bind("click", function(e){ main++; }); jQuery("#qunit-fixture").bind("click", function(e){ main++; });
jQuery("#ap").trigger("click"); jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." ); equals( main, 1, "Verify that the trigger happened correctly." );
...@@ -553,14 +553,14 @@ test("bind(name, false), unbind(name, false)", function() { ...@@ -553,14 +553,14 @@ test("bind(name, false), unbind(name, false)", function() {
equals( main, 1, "Verify that the trigger happened correctly." ); equals( main, 1, "Verify that the trigger happened correctly." );
// manually clean up events from elements outside the fixture // manually clean up events from elements outside the fixture
jQuery("#main").unbind("click"); jQuery("#qunit-fixture").unbind("click");
}); });
test("live(name, false), die(name, false)", function() { test("live(name, false), die(name, false)", function() {
expect(3); expect(3);
var main = 0; var main = 0;
jQuery("#main").live("click", function(e){ main++; }); jQuery("#qunit-fixture").live("click", function(e){ main++; });
jQuery("#ap").trigger("click"); jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." ); equals( main, 1, "Verify that the trigger happened correctly." );
...@@ -573,7 +573,7 @@ test("live(name, false), die(name, false)", function() { ...@@ -573,7 +573,7 @@ test("live(name, false), die(name, false)", function() {
jQuery("#ap").die("click", false); jQuery("#ap").die("click", false);
jQuery("#ap").trigger("click"); jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." ); equals( main, 1, "Verify that the trigger happened correctly." );
jQuery("#main").die("click"); jQuery("#qunit-fixture").die("click");
}); });
test("delegate(selector, name, false), undelegate(selector, name, false)", function() { test("delegate(selector, name, false), undelegate(selector, name, false)", function() {
...@@ -581,7 +581,7 @@ test("delegate(selector, name, false), undelegate(selector, name, false)", funct ...@@ -581,7 +581,7 @@ test("delegate(selector, name, false), undelegate(selector, name, false)", funct
var main = 0; var main = 0;
jQuery("#main").delegate("#ap", "click", function(e){ main++; }); jQuery("#qunit-fixture").delegate("#ap", "click", function(e){ main++; });
jQuery("#ap").trigger("click"); jQuery("#ap").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." ); equals( main, 1, "Verify that the trigger happened correctly." );
...@@ -594,7 +594,7 @@ test("delegate(selector, name, false), undelegate(selector, name, false)", funct ...@@ -594,7 +594,7 @@ test("delegate(selector, name, false), undelegate(selector, name, false)", funct
jQuery("#ap").undelegate("#groups", "click", false); jQuery("#ap").undelegate("#groups", "click", false);
jQuery("#groups").trigger("click"); jQuery("#groups").trigger("click");
equals( main, 1, "Verify that the trigger happened correctly." ); equals( main, 1, "Verify that the trigger happened correctly." );
jQuery("#main").undelegate("#ap", "click"); jQuery("#qunit-fixture").undelegate("#ap", "click");
}); });
test("bind()/trigger()/unbind() on plain object", function() { test("bind()/trigger()/unbind() on plain object", function() {
...@@ -798,7 +798,7 @@ test("trigger() bubbling", function() { ...@@ -798,7 +798,7 @@ test("trigger() bubbling", function() {
jQuery(document).bind("click", function(e){ if ( e.target !== document) { doc++; } }); jQuery(document).bind("click", function(e){ if ( e.target !== document) { doc++; } });
jQuery("html").bind("click", function(e){ html++; }); jQuery("html").bind("click", function(e){ html++; });
jQuery("body").bind("click", function(e){ body++; }); jQuery("body").bind("click", function(e){ body++; });
jQuery("#main").bind("click", function(e){ main++; }); jQuery("#qunit-fixture").bind("click", function(e){ main++; });
jQuery("#ap").bind("click", function(){ ap++; return false; }); jQuery("#ap").bind("click", function(){ ap++; return false; });
jQuery("html").trigger("click"); jQuery("html").trigger("click");
...@@ -812,7 +812,7 @@ test("trigger() bubbling", function() { ...@@ -812,7 +812,7 @@ test("trigger() bubbling", function() {
equals( html, 2, "Body bubble" ); equals( html, 2, "Body bubble" );
equals( body, 1, "Body bubble" ); equals( body, 1, "Body bubble" );
jQuery("#main").trigger("click"); jQuery("#qunit-fixture").trigger("click");
equals( win, 3, "Main bubble" ); equals( win, 3, "Main bubble" );
equals( doc, 3, "Main bubble" ); equals( doc, 3, "Main bubble" );
equals( html, 3, "Main bubble" ); equals( html, 3, "Main bubble" );
...@@ -828,7 +828,7 @@ test("trigger() bubbling", function() { ...@@ -828,7 +828,7 @@ test("trigger() bubbling", function() {
// manually clean up events from elements outside the fixture // manually clean up events from elements outside the fixture
jQuery(document).unbind("click"); jQuery(document).unbind("click");
jQuery("html, body, #main").unbind("click"); jQuery("html, body, #qunit-fixture").unbind("click");
}); });
test("trigger(type, [data], [fn])", function() { test("trigger(type, [data], [fn])", function() {
...@@ -872,7 +872,7 @@ test("trigger(type, [data], [fn])", function() { ...@@ -872,7 +872,7 @@ test("trigger(type, [data], [fn])", function() {
pass = true; pass = true;
try { try {
jQuery("#main table:first").bind("test:test", function(){}).trigger("test:test"); jQuery("#qunit-fixture table:first").bind("test:test", function(){}).trigger("test:test");
} catch (e) { } catch (e) {
pass = false; pass = false;
} }
...@@ -1189,11 +1189,11 @@ test(".live()/.die()", function() { ...@@ -1189,11 +1189,11 @@ test(".live()/.die()", function() {
jQuery("div").die("submit"); jQuery("div").die("submit");
// Test binding with a different context // Test binding with a different context
var clicked = 0, container = jQuery("#main")[0]; var clicked = 0, container = jQuery("#qunit-fixture")[0];
jQuery("#foo", container).live("click", function(e){ clicked++; }); jQuery("#foo", container).live("click", function(e){ clicked++; });
jQuery("div").trigger("click"); jQuery("div").trigger("click");
jQuery("#foo").trigger("click"); jQuery("#foo").trigger("click");
jQuery("#main").trigger("click"); jQuery("#qunit-fixture").trigger("click");
jQuery("body").trigger("click"); jQuery("body").trigger("click");
equals( clicked, 2, "live with a context" ); equals( clicked, 2, "live with a context" );
...@@ -1716,11 +1716,11 @@ test(".delegate()/.undelegate()", function() { ...@@ -1716,11 +1716,11 @@ test(".delegate()/.undelegate()", function() {
jQuery("#body").undelegate("div", "submit"); jQuery("#body").undelegate("div", "submit");
// Test binding with a different context // Test binding with a different context
var clicked = 0, container = jQuery("#main")[0]; var clicked = 0, container = jQuery("#qunit-fixture")[0];
jQuery("#main").delegate("#foo", "click", function(e){ clicked++; }); jQuery("#qunit-fixture").delegate("#foo", "click", function(e){ clicked++; });
jQuery("div").trigger("click"); jQuery("div").trigger("click");
jQuery("#foo").trigger("click"); jQuery("#foo").trigger("click");
jQuery("#main").trigger("click"); jQuery("#qunit-fixture").trigger("click");
jQuery("body").trigger("click"); jQuery("body").trigger("click");
equals( clicked, 2, "delegate with a context" ); equals( clicked, 2, "delegate with a context" );
...@@ -1728,7 +1728,7 @@ test(".delegate()/.undelegate()", function() { ...@@ -1728,7 +1728,7 @@ test(".delegate()/.undelegate()", function() {
ok( jQuery._data(container, "events").live, "delegate with a context" ); ok( jQuery._data(container, "events").live, "delegate with a context" );
// Test unbinding with a different context // Test unbinding with a different context
jQuery("#main").undelegate("#foo", "click"); jQuery("#qunit-fixture").undelegate("#foo", "click");
jQuery("#foo").trigger("click"); jQuery("#foo").trigger("click");
equals( clicked, 2, "undelegate with a context"); equals( clicked, 2, "undelegate with a context");
......
test/unit/manipulation.js
View file @ 3aa46725
This diff is collapsed.
test/unit/traversing.js
View file @ 3aa46725
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment