File tree Expand file tree Collapse file tree 4 files changed +9
-4
lines changed Expand file tree Collapse file tree 4 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -721,7 +721,8 @@ function executeScriptTags(scripts) {
721
721
if ( matchedScripts . length ) return
722
722
723
723
var script = document . createElement ( 'script' )
724
- script . type = $ ( this ) . attr ( 'type' )
724
+ var type = $ ( this ) . attr ( 'type' )
725
+ if ( type ) script . type = type
725
726
script . src = $ ( this ) . attr ( 'src' )
726
727
document . head . appendChild ( script )
727
728
} )
Original file line number Diff line number Diff line change 1
- window . evaledSrcScript = true
2
- window . evaledScriptLoaded ( )
1
+ window . evaledSrcScriptNum = window . evaledSrcScriptNum || 0
2
+ window . evaledSrcScriptNum ++
3
+
4
+ if ( window . evaledSrcScriptNum === 2 )
5
+ window . evaledScriptLoaded ( )
Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ if ($.support.pjax) {
123
123
var frame = this . frame
124
124
125
125
frame . evaledScriptLoaded = function ( ) {
126
- equal ( true , frame . evaledSrcScript )
126
+ equal ( 2 , frame . evaledSrcScriptNum )
127
127
equal ( true , frame . evaledInlineScript )
128
128
start ( )
129
129
}
Original file line number Diff line number Diff line change 1
1
< p > Got some script tags here</ p >
2
2
< script type ="text/javascript " src ="/test/evaled.js "> </ script >
3
+ < script src ="/test/evaled.js "> </ script >
3
4
< script type ="text/javascript "> window . evaledInlineScript = true </ script >
4
5
< script type ="text/javascript "> window . parent . iframeLoad ( window ) </ script >
You can’t perform that action at this time.
0 commit comments