Merge pull request #334 from canjs/332-fix-hard-load

Fixed hard reload. Fixes #332

Author: imaustink

static/canjs.js

@@ -40,7 +40,6 @@ var $articleContainer,
 		if (noModifierKeys && sameHostname && sameProtocol) {
 			ev.preventDefault();
 			var href = this.href;
-			window.history.pushState(null, null, href);
 			navigate(href);
 		}
 	});
@@ -92,7 +91,6 @@ function init() {
 	if (!searchControl) {
 		searchControl = new SearchControl(".search-bar", {
 			navigate: function(href){
-				window.history.pushState(null, null, href);
 				navigate(href);
 			},
 			pathPrefix: window.pathPrefix,
@@ -242,8 +240,11 @@ function navigate(href) {
 			if(searchControl.searchResultsCache){
 				searchControl.renderSearchResults(searchControl.searchResultsCache);
 			}
+      
+      window.history.pushState(null, null, href);
 		},
 		error: function() {
+			window.history.pushState(null, null, href);
 			// just reload the page if this fails
 			window.location.reload();
 		},