Merge pull request #1 from zipper/safari-popstate-bug

zipper · web-flow · commit e2022aa6f640 · 2018-01-22T09:22:56.000+01:00
Fixing condition in popstate event handler
diff --git a/client-side/history.ajax.js b/client-side/history.ajax.js
@@ -48,7 +48,7 @@ $.nette.ext('history', {
 			var state = e.originalEvent.state || this.initialState;
 			var initialPop = (!this.popped && initialUrl === state.href);
 			this.popped = true;
-			if (initialPop || !e.state) {
+			if (initialPop || !e.originalEvent.state) {
 				return;
 			}
 			if (this.cache && state.ui) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ $.nette.ext('history', {`
`48`	`48`	`var state = e.originalEvent.state \|\| this.initialState;`
`49`	`49`	`var initialPop = (!this.popped && initialUrl === state.href);`
`50`	`50`	`this.popped = true;`
`51`		`- if (initialPop \|\| !e.state) {`
	`51`	`+ if (initialPop \|\| !e.originalEvent.state) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`	`if (this.cache && state.ui) {`