diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2018-03-07 20:09:09 -0500 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2018-05-14 14:09:43 -0400 |
| commit | dc48b11e0c6c77e2b96e89a18f34d7b0c4f9a9d4 (patch) | |
| tree | db4f37aee235c25bc970df56bb8359f2d1eddfde | |
| parent | 1f4375a34227f42570d2b72e190e51bcfb1e8597 (diff) | |
| download | jquery-dc48b11e0c6c77e2b96e89a18f34d7b0c4f9a9d4.tar.gz jquery-dc48b11e0c6c77e2b96e89a18f34d7b0c4f9a9d4.zip | |
squash! Set attributes all at once, src last
| -rw-r--r-- | src/ajax/script.js | 13 | ||||
| -rw-r--r-- | test/unit/ajax.js | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/ajax/script.js b/src/ajax/script.js index 292627f7e..410c82cab 100644 --- a/src/ajax/script.js +++ b/src/ajax/script.js @@ -48,19 +48,16 @@ jQuery.ajaxTransport( "script", function( s ) { var script, callback; return { send: function( _, complete ) { - script = jQuery( "<script>" ).prop( { - charset: s.scriptCharset, - src: s.url - } ).attr( s.scriptAttrs || {} ).on( - "load error", - callback = function( evt ) { + script = jQuery( "<script>" ) + .attr( s.scriptAttrs || {} ) + .prop( { charset: s.scriptCharset, src: s.url } ) + .on( "load error", callback = function( evt ) { script.remove(); callback = null; if ( evt ) { complete( evt.type === "error" ? 404 : 200, evt.type ); } - } - ); + } ); // Use native DOM manipulation to avoid our domManip AJAX trickery document.head.appendChild( script[ 0 ] ); diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 8a13810fc..72a4e7215 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -91,15 +91,13 @@ QUnit.module( "ajax", { ajaxTest( "jQuery.ajax() - custom attributes for script tag", 4, function( assert ) { - var nonceValue = "0123456789"; return { create: function( options ) { var xhr; options.dataType = "script"; - options.scriptAttrs = { id: "jquery-ajax-test", nonce: nonceValue }; - xhr = jQuery.ajax( url( "data/script.php?header=ecma" ), options ); - // Ensure the script tag has the nonce attr on it - assert.ok( nonceValue === jQuery( "#jquery-ajax-test" ).attr( "nonce" ), "nonce value" ); + options.scriptAttrs = { id: "jquery-ajax-test", async: "async" }; + xhr = jQuery.ajax( url( "mock.php?action=script" ), options ); + assert.equal( jQuery( "#jquery-ajax-test" ).attr( "async" ), "async", "attr value" ); return xhr; }, success: function() { |