Merge branch 'sshirokov-pjax-with-scripts'

Author: josh

jquery.pjax.js

@@ -260,6 +260,7 @@ function pjax(options) {
 
     if (container.title) document.title = container.title
     context.html(container.contents)
+    executeScriptTags(container.scripts)
 
     // Scroll to top by default
     if (typeof options.scrollTo === 'number')
@@ -630,6 +631,10 @@ function extractContainer(data, xhr, options) {
 
     // Then scrub any titles from their descendents
     obj.contents.find('title').remove()
+
+    // Gather all script[src] elements
+    obj.scripts = findAll(obj.contents, 'script[src]').remove()
+    obj.contents = obj.contents.not(obj.scripts)
   }
 
   // Trim any whitespace off the title
@@ -638,6 +643,33 @@ function extractContainer(data, xhr, options) {
   return obj
 }
 
+// Load an execute scripts using standard script request.
+//
+// Avoids jQuery's traditional $.getScript which does a XHR request and
+// globalEval.
+//
+// scripts - jQuery object of script Elements
+//
+// Returns nothing.
+function executeScriptTags(scripts) {
+  if (!scripts) return
+
+  var existingScripts = $('script[src]')
+
+  scripts.each(function() {
+    var src = this.src
+    var matchedScripts = existingScripts.filter(function() {
+      return this.src === src
+    })
+    if (matchedScripts.length) return
+
+    var script = document.createElement('script')
+    script.type = $(this).attr('type')
+    script.src = $(this).attr('src')
+    document.head.appendChild(script)
+  })
+}
+
 // Internal: History DOM caching class.
 var cacheMapping      = {}
 var cacheForwardStack = []

test/evaled.js

@@ -0,0 +1,2 @@
+window.evaledSrcScript = true
+window.evaledScriptLoaded()

test/unit/pjax.js

@@ -118,6 +118,20 @@ if ($.support.pjax) {
     })
   })
 
+  asyncTest("evals scripts", function() {
+    var frame = this.frame
+
+    frame.evaledScriptLoaded = function() {
+      equal(true, frame.evaledSrcScript)
+      equal(true, frame.evaledInlineScript)
+      start()
+    }
+    frame.$.pjax({
+      url: "scripts.html",
+      container: "#main"
+    })
+  })
+
 
   asyncTest("container option accepts String selector", function() {
     var frame = this.frame

test/views/scripts.erb

@@ -0,0 +1,4 @@
+<p>Got some script tags here</p>
+<script type="text/javascript" src="/test/evaled.js"></script>
+<script type="text/javascript">window.evaledInlineScript = true</script>
+<script type="text/javascript">window.parent.iframeLoad(window)</script>