clear search on route change and fix nav/content

1 files changed, 16 insertions, 2 deletions

diff --git a/js/build/app.js b/js/build/app.js
index bc178ff8c..d383c012f 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -2845,7 +2845,7 @@ app.directive('newsScroll', ["$timeout", "ITEM_AUTO_PAGE_SIZE", "MARK_READ_TIMEO
         }
     };
 }]);
-app.directive('newsSearch', ["$timeout", function ($timeout) {
+app.directive('newsSearch', ["$document", "$timeout", "$location", function ($document, $timeout, $location) {
     'use strict';
 
     var timer;
@@ -2856,7 +2856,10 @@ app.directive('newsSearch', ["$timeout", function ($timeout) {
             'onSearch': '='
         },
         link: function (scope) {
-            $('#searchbox').on('search keyup', function () {
+            var box = $('#searchbox');
+            box.val($location.search().search);
+
+            box.on('search keyup', function () {
                 var value = $(this).val();
                 if (timer) {
                     $timeout.cancel(timer);
@@ -2868,6 +2871,17 @@ app.directive('newsSearch', ["$timeout", function ($timeout) {
                     });
                 }, 500);
             });
+
+            // carry over search on route change
+            scope.$watch(function () {
+                return $location.search();
+            }, function (search) {
+                if (search && search.search) {
+                    box.val(search.search);
+                } else {
+                    box.val('');
+                }
+            });
         }
     };
 }]);