diff options
| -rw-r--r-- | src/manipulation/domManip.js | 2 | ||||
| -rw-r--r-- | test/unit/ajax.js | 2 | ||||
| -rw-r--r-- | test/unit/css.js | 6 | ||||
| -rw-r--r-- | test/unit/traversing.js | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/manipulation/domManip.js b/src/manipulation/domManip.js index f8dded566..65856a67d 100644 --- a/src/manipulation/domManip.js +++ b/src/manipulation/domManip.js @@ -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 diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 471ca0e23..99622c6ce 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -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(); diff --git a/test/unit/css.js b/test/unit/css.js index e4a11175f..7ba147a5e 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -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" ); } ); diff --git a/test/unit/traversing.js b/test/unit/traversing.js index 3cdd9470f..06974d504 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -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" ); |