Merge pull request #359 from decademoon/safari-base-bug

yyx990803 · yyx990803 · commit 43dcd420488d · 2016-01-29T11:34:10.000-08:00
fix history.replaceState() with base and null url
diff --git a/src/history/html5.js b/src/history/html5.js
@@ -48,7 +48,7 @@ export default class HTML5History {
           x: window.pageXOffset,
           y: window.pageYOffset
         }
-      }, '')
+      }, '', location.href)
       // then push new state
       history.pushState({}, '', url)
     }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export default class HTML5History {`
`48`	`48`	`x: window.pageXOffset,`
`49`	`49`	`y: window.pageYOffset`
`50`	`50`	`}`
`51`		`- }, '')`
	`51`	`+ }, '', location.href)`
`52`	`52`	`// then push new state`
`53`	`53`	`history.pushState({}, '', url)`
`54`	`54`	`}`