Merge branch 'master' of https://github.com/canjs/bit-docs-html-canjs into 277-close-menu-mobile

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,
@@ -249,8 +247,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();
 		},

static/search.js

@@ -463,21 +463,6 @@ var Search = Control.extend({
 				self.clear();
 			});
 		}
-
-		// if we click the list item, navigate
-		// if the target element is an anchor tag, simply clear
-		if(this.$resultsContainer && this.$resultsContainer.length){
-			this.$resultsContainer.on("click.search-component", ".search-results > ul > li", function(ev){
-				var $target = $(ev.target),
-						$a;
-
-				if(!$target.is("a")){
-					$a = $target.closest("li").find("a");
-					self.navigate($a.attr("href"));
-					return;
-				}
-			});
-		}
 	},
 	unbindResultsEvents: function(){
 		//hide the search on cancel click