🌐 AI搜索 & 代理 主页
Skip to content

Commit 4592595

Browse files
mgolmgol
authored
Core: Fire iframe script in its context, add doc param in globalEval
1. Support passing custom document to jQuery.globalEval; the script will be invoked in the context of this document. 2. Fire external scripts appended to iframe contents in that iframe context; this was already supported & tested for inline scripts but not for external ones. Fixes gh-4518 Closes gh-4601
1 parent 18db871 commit 4592595

File tree

8 files changed

+74
-10
lines changed

8 files changed

+74
-10
lines changed

‎src/core.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,10 @@ jQuery.extend( {
231231
return true;
232232
},
233233

234-
// Evaluates a script in a global context
235-
globalEval: function( code, options ) {
236-
DOMEval( code, { nonce: options && options.nonce } );
234+
// Evaluates a script in a provided context; falls back to the global one
235+
// if not specified.
236+
globalEval: function( code, options, doc ) {
237+
DOMEval( code, { nonce: options && options.nonce }, doc );
237238
},
238239

239240
each: function( obj, callback ) {

‎src/manipulation.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function domManip( collection, args, callback, ignored ) {
163163
if ( jQuery._evalUrl && !node.noModule ) {
164164
jQuery._evalUrl( node.src, {
165165
nonce: node.nonce || node.getAttribute( "nonce" )
166-
} );
166+
}, doc );
167167
}
168168
} else {
169169
DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );

‎src/manipulation/_evalUrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import jQuery from "../ajax.js";
22

3-
jQuery._evalUrl = function( url, options ) {
3+
jQuery._evalUrl = function( url, options, doc ) {
44
return jQuery.ajax( {
55
url: url,
66

@@ -18,7 +18,7 @@ jQuery._evalUrl = function( url, options ) {
1818
"text script": function() {}
1919
},
2020
dataFilter: function( response ) {
21-
jQuery.globalEval( response, options );
21+
jQuery.globalEval( response, options, doc );
2222
}
2323
} );
2424
};

‎test/data/core/globaleval-context.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset=utf-8 />
5+
<title>body</title>
6+
</head>
7+
<body>
8+
<div id="qunit-fixture"></div>
9+
<script src="../../jquery.js"></script>
10+
<script src="../iframeTest.js"></script>
11+
<script>
12+
startIframeTest();
13+
</script>
14+
</body>
15+
</html>

‎test/data/manipulation/set-global-scripttest.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
window.scriptTest = true;
2+
parent.finishTest();

‎test/data/testinit.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,24 @@ this.testIframe = function( title, fileName, func, wrapper ) {
254254
args.unshift( assert );
255255

256256
setTimeout( function() {
257+
var result;
258+
257259
this.iframeCallback = undefined;
258260

259-
func.apply( this, args );
260-
func = function() {};
261-
$iframe.remove();
262-
done();
261+
result = func.apply( this, args );
262+
263+
function finish() {
264+
func = function() {};
265+
$iframe.remove();
266+
done();
267+
}
268+
269+
// Wait for promises returned by `func`.
270+
if ( result && result.then ) {
271+
result.then( finish );
272+
} else {
273+
finish();
274+
}
263275
} );
264276
};
265277

‎test/unit/core.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@ QUnit.test( "globalEval execution after script injection (#7862)", function( ass
197197
assert.ok( window.strictEvalTest - now < 500, "Code executed synchronously" );
198198
} );
199199

200+
testIframe(
201+
"globalEval with custom document context",
202+
"core/globaleval-context.html",
203+
function( assert, framejQuery, frameWindow, frameDocument ) {
204+
assert.expect( 2 );
205+
206+
jQuery.globalEval( "window.scriptTest = true;", {}, frameDocument );
207+
assert.ok( !window.scriptTest, "script executed in iframe context" );
208+
assert.ok( frameWindow.scriptTest, "script executed in iframe context" );
209+
}
210+
);
211+
212+
200213
QUnit.test( "noConflict", function( assert ) {
201214
assert.expect( 7 );
202215

‎test/unit/manipulation.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,6 +2274,27 @@ testIframe(
22742274
}
22752275
);
22762276

2277+
testIframe(
2278+
"domManip executes external scripts in iframes in the iframes' context",
2279+
"manipulation/scripts-context.html",
2280+
function( assert, framejQuery, frameWindow, frameDocument ) {
2281+
assert.expect( 2 );
2282+
2283+
Globals.register( "finishTest" );
2284+
2285+
return new Promise( function( resolve ) {
2286+
window.finishTest = resolve;
2287+
jQuery( frameDocument.body ).append(
2288+
"<script src='" + url( "manipulation/set-global-scripttest.js" ) + "'></script>" );
2289+
assert.ok( !window.scriptTest, "script executed in iframe context" );
2290+
assert.ok( frameWindow.scriptTest, "script executed in iframe context" );
2291+
} );
2292+
},
2293+
2294+
// The AJAX module is needed for jQuery._evalUrl.
2295+
QUnit[ jQuery.ajax ? "test" : "skip" ]
2296+
);
2297+
22772298
QUnit.test( "jQuery.clone - no exceptions for object elements #9587", function( assert ) {
22782299

22792300
assert.expect( 1 );

0 commit comments

Comments
 (0)