Merge branch 'master' of https://github.com/defunkt/jquery-pjax

josh · josh · commit 693ddba2da66 · 2013-05-24T12:24:27.000-05:00
diff --git a/jquery.pjax.js b/jquery.pjax.js
@@ -779,7 +779,7 @@ function enable() {
     maxCacheLength: 20,
     version: findVersion
   }
-  $(window).bind('popstate.pjax', onPjaxPopstate)
+  $(window).on('popstate.pjax', onPjaxPopstate)
 }
 
 // Disable pushState behavior.
@@ -802,7 +802,7 @@ function disable() {
   $.pjax.submit = $.noop
   $.pjax.reload = function() { window.location.reload() }
 
-  $(window).unbind('popstate.pjax', onPjaxPopstate)
+  $(window).off('popstate.pjax', onPjaxPopstate)
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ function enable() {`
`779`	`779`	`maxCacheLength: 20,`
`780`	`780`	`version: findVersion`
`781`	`781`	`}`
`782`		`- $(window).bind('popstate.pjax', onPjaxPopstate)`
	`782`	`+ $(window).on('popstate.pjax', onPjaxPopstate)`
`783`	`783`	`}`
`784`	`784`
`785`	`785`	`// Disable pushState behavior.`
`@@ -802,7 +802,7 @@ function disable() {`
`802`	`802`	`$.pjax.submit = $.noop`
`803`	`803`	`$.pjax.reload = function() { window.location.reload() }`
`804`	`804`
`805`		`- $(window).unbind('popstate.pjax', onPjaxPopstate)`
	`805`	`+ $(window).off('popstate.pjax', onPjaxPopstate)`
`806`	`806`	`}`
`807`	`807`
`808`	`808`