Skip to content

Commit e7c6462

Browse files
loonkwilmislav
authored andcommitted
Fix handling <script src> tags with no type attribute
Avoid setting the dynamic `script.src` to "undefined". Closes #271
1 parent 863b802 commit e7c6462

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

jquery.pjax.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,8 @@ function executeScriptTags(scripts) {
721721
if (matchedScripts.length) return
722722

723723
var script = document.createElement('script')
724-
script.type = $(this).attr('type')
724+
var type = $(this).attr('type')
725+
if (type) script.type = type
725726
script.src = $(this).attr('src')
726727
document.head.appendChild(script)
727728
})

test/evaled.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
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()

test/unit/pjax.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if ($.support.pjax) {
123123
var frame = this.frame
124124

125125
frame.evaledScriptLoaded = function() {
126-
equal(true, frame.evaledSrcScript)
126+
equal(2, frame.evaledSrcScriptNum)
127127
equal(true, frame.evaledInlineScript)
128128
start()
129129
}

test/views/scripts.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<p>Got some script tags here</p>
22
<script type="text/javascript" src="/test/evaled.js"></script>
3+
<script src="/test/evaled.js"></script>
34
<script type="text/javascript">window.evaledInlineScript = true</script>
45
<script type="text/javascript">window.parent.iframeLoad(window)</script>

0 commit comments

Comments
 (0)