Merge pull request #11 from robotboy655/patch-1

Navigating back to main page works

Author: samuelmaddock

app/scripts/controllers.js

@@ -187,18 +187,15 @@ angular.module('docsApp.controllers', [])
 		window.onpopstate = function( e ) {
 			resultsResetScroll();
 			$scope.$apply(function() {
-				var filter = $location.search().f;
-				if ( filter ) {
-					$scope.docFilter = filter; // Update content
-					$scope.query = ''; // Update the sidebar
-					$scope.queryModel = ''; // Update the search text
-				}
-
 				var query = $location.search().q;
 				if ( query ) {
 					$scope.docFilter = query;
 					$scope.query = query;
 					$scope.queryModel = query;
+				} else {
+					$scope.docFilter = $location.search().f || ''; // Update content
+					$scope.query = ''; // Update the sidebar
+					$scope.queryModel = ''; // Update the search text
 				}
 			});
 		}