Merge branch 'merlin'

Leonardo Merlin
2 parents 04d08432 f9ad87ad
Showing 1 changed file with 9 additions and 1 deletions Show diff stats
js/main.js
@@ -161,6 +161,10 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
                 $proposalDetail.find('.experience-proposal-container').show();
                 $proposalDetail.find('.talk-proposal-container').show();
                 $resultsContainer.hide();
+
+                // remove '/resultados' from URL
+                window.location.hash = window.location.hash.split('/resultados')[0];
+                e.preventDefault();
               }
             });
@@ -1250,7 +1254,11 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
       $.removeCookie('*');
       logged_in = false;
       Main.showLogin();
-      location.reload();
+      if(window.location.hash.indexOf('/resultados') !== -1){
+        window.location.hash = window.location.hash.split('/resultados')[0];
+      }else{
+        location.reload();
+      }
       e.preventDefault();
     });