Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/manipulation/domManip.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function domManip( collection, args, callback, ignored ) {
if ( hasScripts ) {
doc = scripts[ scripts.length - 1 ].ownerDocument;

// Reenable scripts
// Re-enable scripts
jQuery.map( scripts, restoreScript );

// Evaluate executable scripts on first document insertion
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -2711,7 +2711,7 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
} );

QUnit.test(
"jQuery#load() - always use GET method even if it overrided through ajaxSetup (trac-11264)",
"jQuery#load() - always use GET method even if overridden through ajaxSetup (trac-11264)",
function( assert ) {
assert.expect( 1 );
var done = assert.async();
Expand Down
6 changes: 3 additions & 3 deletions test/unit/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -1409,13 +1409,13 @@ QUnit.testUnlessIE( "css('width') and css('height') should return fractional val
"css('height') should return fractional values" );
} );

QUnit.test( "certain css values of 'normal' should be convertable to a number, see trac-8627", function( assert ) {
QUnit.test( "certain css values of 'normal' should be convertible to a number, see trac-8627", function( assert ) {
assert.expect( 3 );

var el = jQuery( "<div style='letter-spacing:normal;font-weight:normal;'>test</div>" ).appendTo( "#qunit-fixture" );

assert.ok( !isNaN( parseFloat( el.css( "letterSpacing" ) ) ), "css('letterSpacing') not convertable to number, see trac-8627" );
assert.ok( !isNaN( parseFloat( el.css( "fontWeight" ) ) ), "css('fontWeight') not convertable to number, see trac-8627" );
assert.ok( !isNaN( parseFloat( el.css( "letterSpacing" ) ) ), "css('letterSpacing') not convertible to number, see trac-8627" );
assert.ok( !isNaN( parseFloat( el.css( "fontWeight" ) ) ), "css('fontWeight') not convertible to number, see trac-8627" );
assert.equal( typeof el.css( "fontWeight" ), "string", ".css() returns a string" );
} );

Expand Down
4 changes: 2 additions & 2 deletions test/unit/traversing.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ QUnit[ QUnit.jQuerySelectors ? "test" : "skip" ]( "is() with :has() selectors",

assert.ok( jQuery( "#foo" ).is( ":has(p)" ), "Check for child: Expected a child 'p' element" );
assert.ok( !jQuery( "#foo" ).is( ":has(ul)" ), "Check for child: Did not expect 'ul' element" );
assert.ok( jQuery( "#foo" ).is( ":has(p):has(a):has(code)" ), "Check for childs: Expected 'p', 'a' and 'code' child elements" );
assert.ok( !jQuery( "#foo" ).is( ":has(p):has(a):has(code):has(ol)" ), "Check for childs: Expected 'p', 'a' and 'code' child elements, but no 'ol'" );
assert.ok( jQuery( "#foo" ).is( ":has(p):has(a):has(code)" ), "Check for children: Expected 'p', 'a' and 'code' child elements" );
assert.ok( !jQuery( "#foo" ).is( ":has(p):has(a):has(code):has(ol)" ), "Check for children: Expected 'p', 'a' and 'code' child elements, but no 'ol'" );

assert.ok( jQuery( "#foo" ).is( jQuery( "div:has(p)" ) ), "Check for child: Expected a child 'p' element" );
assert.ok( !jQuery( "#foo" ).is( jQuery( "div:has(ul)" ) ), "Check for child: Did not expect 'ul' element" );
Expand Down