From e1d06eddf4eae66a3bc0882f044fd5390328ebc8 Mon Sep 17 00:00:00 2001
From: mossroy <mossroy@free.fr>
Date: Sat, 12 Apr 2014 14:59:20 +0200
Subject: [PATCH] Fix a few glitches in the history.back() behavior. Fixes #88

---
 www/js/app.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index d102d056..35ba97ad 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -54,6 +54,7 @@ define(function(require) {
     
     // Define behavior of HTML elements
     $('#searchTitles').on('click', function(e) {
+        pushBrowserHistoryState(null, $('#prefix').val());
         searchTitlesFromPrefix($('#prefix').val());
         $("#welcomeText").hide();
         $("#readingArticle").hide();
@@ -280,7 +281,7 @@ define(function(require) {
             if ($('#navbarToggle').is(":visible") && $('#liHomeNav').is(':visible')) {
                 $('#navbarToggle').click();
             }
-            $('#searchingForTitles').show();
+            $('#searchingForTitles').hide();
             $('#configuration').hide();
             $('#titleList').hide();
             $('#titleListHeaderMessage').hide();
@@ -293,7 +294,7 @@ define(function(require) {
             }
             else if (titleSearch && !(""===titleSearch)) {
                 $('#prefix').val(titleSearch);
-                $('#searchTitles').click();
+                searchTitlesFromPrefix($('#prefix').val());
             }
             else if (latitude && !(""===latitude)) {
                 maxDistanceArticlesNearbySearch = maxDistance;
@@ -444,8 +445,6 @@ define(function(require) {
             currentLongitude = currentCoordinates.x;
         }
         
-        pushBrowserHistoryState(null, $('#prefix').val(), currentLatitude, currentLongitude, maxDistanceArticlesNearbySearch);
-        
         var titleListHeaderMessageDiv = $('#titleListHeaderMessage');
         var nbTitles = 0;
         if (titleArray) {
@@ -754,6 +753,8 @@ define(function(require) {
                                 + "<br/>Now looking for articles around this location...");
                         
                         currentCoordinates = new geometry.point(crd.longitude, crd.latitude);
+                        
+                        pushBrowserHistoryState(null, null, crd.latitude, crd.longitude, maxDistanceArticlesNearbySearch);
 
                         searchTitlesNearbyGivenCoordinates(crd.latitude, crd.longitude, maxDistanceArticlesNearbySearch);
                     }