mirror of
https://github.com/jquery/jquery.git
synced 2026-04-20 03:01:22 -04:00
Conflicts: Gruntfile.js README.md src/ajax.js src/ajax/xhr.js src/attributes.js src/core.js src/css.js src/data.js src/effects.js src/event.js src/manipulation.js src/offset.js src/selector-native.js src/traversing.js test/unit/core.js test/unit/data.js
This commit is contained in:
@@ -17,13 +17,6 @@ test("Basic requirements", function() {
|
||||
ok( $, "$" );
|
||||
});
|
||||
|
||||
testIframeWithCallback( "Conditional compilation compatibility (#13274)", "core/cc_on.html", function( cc_on, errors, $ ) {
|
||||
expect( 3 );
|
||||
ok( true, "JScript conditional compilation " + ( cc_on ? "supported" : "not supported" ) );
|
||||
deepEqual( errors, [], "No errors" );
|
||||
ok( $(), "jQuery executes" );
|
||||
});
|
||||
|
||||
test("jQuery()", function() {
|
||||
|
||||
var elem, i,
|
||||
@@ -1358,3 +1351,10 @@ test("jQuery.camelCase()", function() {
|
||||
equal( jQuery.camelCase( key ), val, "Converts: " + key + " => " + val );
|
||||
});
|
||||
});
|
||||
|
||||
testIframeWithCallback( "Conditional compilation compatibility (#13274)", "core/cc_on.html", function( cc_on, errors, $ ) {
|
||||
expect( 3 );
|
||||
ok( true, "JScript conditional compilation " + ( cc_on ? "supported" : "not supported" ) );
|
||||
deepEqual( errors, [], "No errors" );
|
||||
ok( $(), "jQuery executes" );
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user