Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/pjax_rails
base: master
...
head fork: pehlert/pjax_rails
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 1 addition and 6 deletions.
  1. +0 −5 lib/pjax.rb
  2. +1 −1  vendor/assets/javascripts/jquery.pjax.js
View
5 lib/pjax.rb
@@ -2,7 +2,6 @@ module Pjax
extend ActiveSupport::Concern
included do
- layout proc { |c| pjax_request? ? pjax_layout : 'application' }
helper_method :pjax_request?
rescue_from Pjax::Unsupported, :with => :pjax_unsupported
@@ -19,10 +18,6 @@ def pjax_request?
env['HTTP_X_PJAX'].present?
end
- def pjax_layout
- false
- end
-
def pjax_container
return unless pjax_request?
request.headers['X-PJAX-Container']
View
2  vendor/assets/javascripts/jquery.pjax.js
@@ -569,7 +569,7 @@ function extractContainer(data, xhr, options) {
var $head = $(data.match(/<head[^>]*>([\s\S.]*)<\/head>/i)[0])
var $body = $(data.match(/<body[^>]*>([\s\S.]*)<\/body>/i)[0])
} else {
- var $head = $body = $(data)
+ var $head = $body = $($.parseHTML(data, document, true))
}
// If response data is empty, return fast

No commit comments for this range

Something went wrong with that request. Please try again.