Skip to content

Only set pjax.state if pushing or replacing #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Only set pjax.state if pushing or replacing #396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46608ba
Only set pjax.state if pushing or replacing
AlexHill Jun 5, 2014
170dcc3
Set options.replace true in popstate handler
AlexHill Jun 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions jquery.pjax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,17 +252,15 @@ function pjax(options) {
locationReplace(container.url)
return
}

pjax.state = {
id: options.id || uniqueId(),
url: container.url,
title: container.title,
container: context.selector,
fragment: options.fragment,
timeout: options.timeout
}

if (options.push || options.replace) {
pjax.state = {
id: options.id || uniqueId(),
url: container.url,
title: container.title,
container: context.selector,
fragment: options.fragment,
timeout: options.timeout
}
window.history.replaceState(pjax.state, container.title, container.url)
}

Expand Down Expand Up @@ -318,7 +316,7 @@ function pjax(options) {
// using the container and options of the link we're loading for the
// back button to the initial page. This ensures good back button
// behavior.
if (!pjax.state) {
if ((options.push || options.replace) && !pjax.state) {
pjax.state = {
id: uniqueId(),
url: window.location.href,
Expand Down Expand Up @@ -439,6 +437,7 @@ function onPjaxPopstate(event) {
url: state.url,
container: container,
push: false,
replace: true,
fragment: state.fragment,
timeout: state.timeout,
scrollTo: false
Expand Down