pjax_rails 0.1.8 → 0.1.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.1.9*
+
+* Use latest jquery-pjax JavaScript code [2011-08-29 version, see https://github.com/defunkt/jquery-pjax/commits/master]
+
 *0.1.8*
 
 * Expand the selector to allow data-skip-pjax to be applied to a container and have that affect all its children [Sam Stephenson]

data/lib/assets/javascripts/pjax/jquery_pjax.js

@@ -1,6 +1,8 @@
-// jquery_pjax.js
+// jquery.pjax.js
 // copyright chris wanstrath
-// https://github.com/defunkt/pjax
+// https://github.com/defunkt/jquery-pjax
+
+(function($){
 
 // When called on a link, fetches the href with ajax into the
 // container specified as the first parameter or with the data-pjax
@@ -27,6 +29,13 @@ $.fn.pjax = function( container, options ) {
   else
     options = $.isPlainObject(container) ? container : {container:container}
 
+  // We can't persist $objects using the history API so we must use
+  // a String selector. Bail if we got anything else.
+  if ( options.container && typeof options.container !== 'string' ) {
+    throw "pjax container must be a string selector!"
+    return false
+  }
+
   return this.live('click', function(event){
     // Middle click, cmd click, and ctrl click should open
     // links in a new tab as normal.
@@ -35,7 +44,9 @@ $.fn.pjax = function( container, options ) {
 
     var defaults = {
       url: this.href,
-      container: $(this).attr('data-pjax')
+      container: $(this).attr('data-pjax'),
+      clickedElement: $(this),
+      fragment: null
     }
 
     $.pjax($.extend({}, defaults, options))
@@ -53,7 +64,7 @@ $.fn.pjax = function( container, options ) {
 //
 // Accepts these extra keys:
 //
-// container - Where to stick the response body.
+// container - Where to stick the response body. Must be a String.
 //             $(container).html(xhr.responseBody)
 //      push - Whether to pushState the URL. Defaults to true (of course).
 //   replace - Want to use replaceState instead? That's cool.
@@ -64,102 +75,126 @@ $.fn.pjax = function( container, options ) {
 //   console.log( xhr.readyState )
 //
 // Returns whatever $.ajax returns.
-$.pjax = function( options ) {
+var pjax = $.pjax = function( options ) {
   var $container = $(options.container),
       success = options.success || $.noop
 
   // We don't want to let anyone override our success handler.
   delete options.success
 
-  var defaults = {
-    timeout: 1500,
-    push: true,
-    replace: false,
-    // We want the browser to maintain two separate internal caches: one for
-    // pjax'd partial page loads and one for normal page loads. Without
-    // adding this secret parameter, some browsers will often confuse the two.
-    data: { _pjax: true },
-    type: 'GET',
-    dataType: 'html',
-    beforeSend: function(xhr){
-      $(document).trigger('start.pjax')
-      xhr.setRequestHeader('X-PJAX', 'true')
-    },
-    error: function(){
-      window.location = options.url
-    },
-    complete: function(){
-      $(document).trigger('end.pjax')
-    },
-    success: function(data){
-      // If we got no data or an entire web page, go directly
-      // to the page and let normal error handling happen.
-      if ( !$.trim(data) || /<html/i.test(data) )
+  // We can't persist $objects using the history API so we must use
+  // a String selector. Bail if we got anything else.
+  if ( typeof options.container !== 'string' )
+    throw "pjax container must be a string selector!"
+
+  options = $.extend(true, {}, pjax.defaults, options)
+
+  if ( $.isFunction(options.url) ) {
+    options.url = options.url()
+  }
+
+  options.context = $container
+
+  options.success = function(data){
+    if ( options.fragment ) {
+      // If they specified a fragment, look for it in the response
+      // and pull it out.
+      var $fragment = $(data).find(options.fragment)
+      if ( $fragment.length )
+        data = $fragment.children()
+      else
         return window.location = options.url
+    } else {
+        // If we got no data or an entire web page, go directly
+        // to the page and let normal error handling happen.
+        if ( !$.trim(data) || /<html/i.test(data) )
+          return window.location = options.url
+    }
 
-      // Make it happen.
-      $container.html(data)
+    // Make it happen.
+    this.html(data)
 
-      // If there's a <title> tag in the response, use it as
-      // the page's title.
-      var oldTitle = document.title,
-          title = $.trim( $container.find('title').remove().text() )
-      if ( title ) document.title = title
+    // If there's a <title> tag in the response, use it as
+    // the page's title.
+    var oldTitle = document.title,
+        title = $.trim( this.find('title').remove().text() )
+    if ( title ) document.title = title
 
-      var state = {
-        pjax: options.container,
-        timeout: options.timeout
-      }
+    var state = {
+      pjax: options.container,
+      fragment: options.fragment,
+      timeout: options.timeout
+    }
 
-      // We can't persist $objects using the history API so we need to store
-      // the string selector.
-      if ( $.isPlainObject(state.pjax) )
-        state.pjax = state.pjax.selector
-
-      // If there are extra params, save the complete URL in the state object
-      var query = $.param(options.data)
-      if ( query != "_pjax=true" )
-        state.url = options.url + (/\?/.test(options.url) ? "&" : "?") + query
-
-      if ( options.replace ) {
-        window.history.replaceState(state, document.title, options.url)
-      } else if ( options.push ) {
-        // this extra replaceState before first push ensures good back
-        // button behavior
-        if ( !$.pjax.active ) {
-          window.history.replaceState($.extend({}, state, {url:null}), oldTitle)
-          $.pjax.active = true
-        }
-
-        window.history.pushState(state, document.title, options.url)
+    // If there are extra params, save the complete URL in the state object
+    var query = $.param(options.data)
+    if ( query != "_pjax=true" )
+      state.url = options.url + (/\?/.test(options.url) ? "&" : "?") + query
+
+    if ( options.replace ) {
+      window.history.replaceState(state, document.title, options.url)
+    } else if ( options.push ) {
+      // this extra replaceState before first push ensures good back
+      // button behavior
+      if ( !pjax.active ) {
+        window.history.replaceState($.extend({}, state, {url:null}), oldTitle)
+        pjax.active = true
       }
 
-      // Google Analytics support
-      if ( (options.replace || options.push) && window._gaq )
-        _gaq.push(['_trackPageview'])
-
-      // Invoke their success handler if they gave us one.
-      success.apply(this, arguments)
+      window.history.pushState(state, document.title, options.url)
     }
-  }
 
-  options = $.extend(true, {}, defaults, options)
+    // Google Analytics support
+    if ( (options.replace || options.push) && window._gaq )
+      _gaq.push(['_trackPageview'])
 
-  if ( $.isFunction(options.url) ) {
-    options.url = options.url()
+    // If the URL has a hash in it, make sure the browser
+    // knows to navigate to the hash.
+    var hash = window.location.hash.toString()
+    if ( hash !== '' ) {
+      window.location.href = hash
+    }
+
+    // Invoke their success handler if they gave us one.
+    success.apply(this, arguments)
   }
 
   // Cancel the current request if we're already pjaxing
-  var xhr = $.pjax.xhr
+  var xhr = pjax.xhr
   if ( xhr && xhr.readyState < 4) {
     xhr.onreadystatechange = $.noop
     xhr.abort()
   }
 
-  $.pjax.xhr = $.ajax(options)
-  $(document).trigger('pjax', $.pjax.xhr, options)
+  pjax.options = options
+  pjax.xhr = $.ajax(options)
+  $(document).trigger('pjax', [pjax.xhr, options])
+
+  return pjax.xhr
+}
+
 
-  return $.pjax.xhr
+pjax.defaults = {
+  timeout: 650,
+  push: true,
+  replace: false,
+  // We want the browser to maintain two separate internal caches: one for
+  // pjax'd partial page loads and one for normal page loads. Without
+  // adding this secret parameter, some browsers will often confuse the two.
+  data: { _pjax: true },
+  type: 'GET',
+  dataType: 'html',
+  beforeSend: function(xhr){
+    this.trigger('start.pjax', [xhr, pjax.options])
+    xhr.setRequestHeader('X-PJAX', 'true')
+  },
+  error: function(xhr, textStatus, errorThrown){
+    if ( textStatus !== 'abort' )
+      window.location = pjax.options.url
+  },
+  complete: function(xhr){
+    this.trigger('end.pjax', [xhr, pjax.options])
+  }
 }
 
 
@@ -172,7 +207,7 @@ var popped = ('state' in window.history), initialURL = location.href
 //
 // You probably shouldn't use pjax on pages with other pushState
 // stuff yet.
-$(window).bind('popstate', function(event) {
+$(window).bind('popstate', function(event){
   // Ignore inital popstate that some browsers fire on page load
   var initialPop = !popped && location.href == initialURL
   popped = true
@@ -181,11 +216,12 @@ $(window).bind('popstate', function(event) {
   var state = event.state
 
   if ( state && state.pjax ) {
-    var $container = $(state.pjax+'')
-    if ( $container.length )
+    var container = state.pjax
+    if ( $(container+'').length )
       $.pjax({
         url: state.url || location.href,
-        container: $container,
+        fragment: state.fragment,
+        container: container,
         push: false,
         timeout: state.timeout
       })
@@ -197,12 +233,23 @@ $(window).bind('popstate', function(event) {
 
 // Add the state property to jQuery's event object so we can use it in
 // $(window).bind('popstate')
-if ( $.event.props.indexOf('state') < 0 )
+if ( $.inArray('state', $.event.props) < 0 )
   $.event.props.push('state')
 
 
+// Is pjax supported by this browser?
+$.support.pjax =
+  window.history && window.history.pushState && window.history.replaceState
+  // pushState isn't reliable on iOS yet.
+  && !navigator.userAgent.match(/(iPod|iPhone|iPad|WebApps\/.+CFNetwork)/)
+
+
 // Fall back to normalcy for older browsers.
-if ( !window.history || !window.history.pushState ) {
-  $.pjax = $.noop
+if ( !$.support.pjax ) {
+  $.pjax = function( options ) {
+    window.location = $.isFunction(options.url) ? options.url() : options.url
+  }
   $.fn.pjax = function() { return this }
-}
+}
+
+})(jQuery);

data/pjax_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'pjax_rails'
-  s.version = '0.1.8'
+  s.version = '0.1.9'
   s.author  = 'David Heinemeier Hansson (PJAX by Chris Wanstrath)'
   s.email   = 'david@loudthinking.com'
   s.summary = 'PJAX integration for Rails 3.1+'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pjax_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2164347420 !ruby/object:Gem::Requirement
+  requirement: &2152605760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164347420
+  version_requirements: *2152605760
 description: 
 email: david@loudthinking.com
 executables: []
@@ -36,6 +36,7 @@ files:
 - ./lib/pjax.rb
 - ./lib/pjax_rails.rb
 - ./pjax_rails-0.1.7.gem
+- ./pjax_rails-0.1.8.gem
 - ./pjax_rails.gemspec
 - ./README.md
 homepage: