Accomodate query strings when updating URL

Chris Ferdinandi · Chris Ferdinandi · commit 951dcc252dad · 2014-12-13T22:26:52.000-05:00
diff --git a/README.md b/README.md
@@ -233,6 +233,7 @@ If the `<body>` element has been assigned a height of `100%`, Smooth Scroll is u
 * AMD support and numerous code improvements by [Todd Motto](https://github.com/toddmotto).
 * Push State bug fix by [Yanick Witschi](https://github.com/Toflar).
 * CommonJS module support by [Riku Rouvila](https://github.com/rikukissa).
+* Query string fix when updating URL by [Qu Yatong](https://github.com/quyatong).
 * Unit tests by [Thibaud Colas](https://github.com/ThibWeb).
 
 
@@ -252,6 +253,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/).
 
 Smooth Scroll uses [semantic versioning](http://semver.org/).
 
+* v5.2.2 - December 13, 2014
+	* Updating URL now accounts for query strings.
 * v5.2.1 - December 13, 2014
 	* Added unit tests.
 * v5.2.0 - November 21, 2014
diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js
@@ -1,5 +1,5 @@
 /**
- * smooth-scroll v5.2.1
+ * smooth-scroll v5.2.2
  * Animate scrolling to anchor links, by Chris Ferdinandi.
  * http://github.com/cferdinandi/smooth-scroll
  * 
@@ -255,9 +255,7 @@
 	 */
 	var updateUrl = function ( anchor, url ) {
 		if ( history.pushState && (url || url === 'true') ) {
-			history.pushState( {
-				pos: anchor.id
-			}, '', window.location.pathname + anchor );
+			history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') );
 		}
 	};
 
diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js
diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js
@@ -1,5 +1,5 @@
 /**
- * smooth-scroll v5.2.1
+ * smooth-scroll v5.2.2
  * Animate scrolling to anchor links, by Chris Ferdinandi.
  * http://github.com/cferdinandi/smooth-scroll
  * 
@@ -255,9 +255,7 @@
 	 */
 	var updateUrl = function ( anchor, url ) {
 		if ( history.pushState && (url || url === 'true') ) {
-			history.pushState( {
-				pos: anchor.id
-			}, '', window.location.pathname + anchor );
+			history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') );
 		}
 	};
 
diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "smooth-scroll",
-	"version": "5.2.1",
+	"version": "5.2.2",
 	"description": "Animate scrolling to anchor links",
 	"main": "./dist/js/smooth-scroll.js",
 	"author": {
diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js
@@ -246,9 +246,7 @@
 	 */
 	var updateUrl = function ( anchor, url ) {
 		if ( history.pushState && (url || url === 'true') ) {
-			history.pushState( {
-				pos: anchor.id
-			}, '', window.location.pathname + anchor );
+			history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') );
 		}
 	};
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "smooth-scroll",`
`3`		`- "version": "5.2.1",`
	`3`	`+ "version": "5.2.2",`
`4`	`4`	`"description": "Animate scrolling to anchor links",`
`5`	`5`	`"main": "./dist/js/smooth-scroll.js",`
`6`	`6`	`"author": {`