library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Manipulation: Respect script nomodule attribute in DOM manipulation

Browse Source 
PR #3869 added support for `<script type="module">` & some support for
the `nomodule` attribute but with no tests for `nomodule` and with the
attribute only respected on inline scripts. This commit adds support for
source-based scripts as well. It also adds tests for `nomodule`, including
making sure legacy browsers execute such scripts as they'd natively do - that's
the whole point of `nomodule` scripts, after all.

Fixes gh-4281
Closes gh-4282
Ref gh-3871
Ref gh-3869
This commit is contained in:
Michał Gołębiowski-Owczarek 2019-01-21 18:34:40 +01:00 committed by GitHub
parent 543d3d24ea
commit e4de8b4626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/manipulation.js
View File

@ -198,7 +198,7 @@ function domManip( collection, args, callback, ignored ) {
if ( node.src && ( node.type || "" ).toLowerCase() !== "module" ) { if ( node.src && ( node.type || "" ).toLowerCase() !== "module" ) {
// Optional AJAX dependency, but won't run scripts if not present // Optional AJAX dependency, but won't run scripts if not present
if ( jQuery._evalUrl ) { if ( jQuery._evalUrl && !node.noModule ) {
jQuery._evalUrl( node.src ); jQuery._evalUrl( node.src );
} }
} else { } else {

1
test/data/inner_nomodule.js Normal file
View File

@ -0,0 +1 @@
window.ok( !QUnit.moduleTypeSupported, "evaluated: inner nomodule script with src" );

1
test/data/nomodule.js Normal file
View File

@ -0,0 +1 @@
window.ok( !QUnit.moduleTypeSupported, "evaluated: nomodule script with src" );

32
test/unit/manipulation.js
View File

@ -1798,7 +1798,7 @@ QUnit.test( "html(Function)", function( assert ) {
} ); } );
QUnit[ QUnit[
// Support: Edge 16-17 // Support: Edge 16-18+
// Edge sometimes doesn't execute module scripts so skip the test there. // Edge sometimes doesn't execute module scripts so skip the test there.
( QUnit.moduleTypeSupported && !/edge\//i.test( navigator.userAgent ) ) ? ( QUnit.moduleTypeSupported && !/edge\//i.test( navigator.userAgent ) ) ?
"test" : "test" :
@ -1825,6 +1825,36 @@ QUnit[
}, 1000 ); }, 1000 );
} ); } );
QUnit[
// Support: IE 9-11 only, Android 4.0-4.4 only, iOS 7-10 only
// `nomodule` scripts should be executed by legacy browsers only.
// iOS 10 supports `<script type="module">` but doesn't support the nomodule attribute
// so let's skip it here; sites supporting it must handle `nomodule` in a custom way anyway.
!/iphone os 10_/i.test( navigator.userAgent ) ?
"test" :
"skip"
]( "html(script nomodule)", function( assert ) {
assert.expect( QUnit.moduleTypeSupported ? 0 : 4 );
var done = assert.async(),
$fixture = jQuery( "#qunit-fixture" );
$fixture.html(
[
"<script nomodule>ok( !QUnit.moduleTypeSupported, 'evaluated: nomodule script' );</script>",
"<script nomodule src='" + url( "nomodule.js" ) + "'></script>",
"<div>",
"<script nomodule>ok( !QUnit.moduleTypeSupported, 'evaluated: inner nomodule script' );</script>",
"<script nomodule src='" + url( "inner_nomodule.js" ) + "'></script>",
"</div>"
].join( "" )
);
// Allow asynchronous script execution to generate assertions
setTimeout( function() {
done();
}, 1000 );
} );
QUnit.test( "html(Function) with incoming value -- direct selection", function( assert ) { QUnit.test( "html(Function) with incoming value -- direct selection", function( assert ) {
assert.expect( 4 ); assert.expect( 4 );