From 741fe39ac874ee585c7d762dc7272386841827b8 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Fri, 13 Nov 2015 19:49:10 +0300 Subject: [PATCH] Revert "Manipulation: execute scripts from iframe in the iframe's context" This reverts commit 22449eb968622c2e14d6c8d8de2cf1e1ba4adccd. --- src/manipulation.js | 2 +- test/data/manipulation/scripts-context.html | 18 ------------------ test/unit/manipulation.js | 11 ----------- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 test/data/manipulation/scripts-context.html diff --git a/src/manipulation.js b/src/manipulation.js index eaf2e0998..ceb970cbd 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -192,7 +192,7 @@ function domManip( collection, args, callback, ignored ) { jQuery._evalUrl( node.src ); } } else { - jQuery.globalEval( node.textContent.replace( rcleanScript, "" ), doc ); + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); } } } diff --git a/test/data/manipulation/scripts-context.html b/test/data/manipulation/scripts-context.html deleted file mode 100644 index 6958453c5..000000000 --- a/test/data/manipulation/scripts-context.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - body - - -
- - - - diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index e62eae16b..050853bf5 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -2183,17 +2183,6 @@ testIframeWithCallback( } ); -testIframeWithCallback( - "domManip executes scripts in iframes in the iframes' context", - "manipulation/scripts-context.html", - function( frameWindow, bodyElement, html, assert ) { - assert.expect( 2 ); - jQuery( bodyElement ).append( html ); - assert.ok( !window.scriptTest, "script executed in iframe context" ); - assert.ok( frameWindow.scriptTest, "script executed in iframe context" ); - } -); - QUnit.test( "jQuery.clone - no exceptions for object elements #9587", function( assert ) { assert.expect( 1 ); -- 2.39.5