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

Make sure that jQuery works even when the individual modules are loaded separately AND jQuery.noConflict(true) is used. Fixes #7011.

Browse source
This commit is contained in:
jeresig 2010-09-08 13:54:33 -04:00
parent 116f3b7c72
commit bca5765502
13 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/unit/core.js
View file

@ -183,7 +183,7 @@ test("browser", function() {
}
test("noConflict", function() {
expect(6);
expect(7);
var $$ = jQuery;
@ -196,6 +196,7 @@ test("noConflict", function() {
equals( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
equals( jQuery, originaljQuery, "Make sure jQuery was reverted." );
equals( $, original$, "Make sure $ was reverted." );
ok( $$("#main").html("test"), "Make sure that jQuery still works." );
jQuery = $$;
});