Commit 907014000623f481ebd153b0e2f9c5fbeccf6c3e
Exists in
master
and in
5 other branches
Merge branch 'merlin'
Showing
1 changed file
with
9 additions
and
1 deletions
Show diff stats
js/main.js
... | ... | @@ -161,6 +161,10 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun |
161 | 161 | $proposalDetail.find('.experience-proposal-container').show(); |
162 | 162 | $proposalDetail.find('.talk-proposal-container').show(); |
163 | 163 | $resultsContainer.hide(); |
164 | + | |
165 | + // remove '/resultados' from URL | |
166 | + window.location.hash = window.location.hash.split('/resultados')[0]; | |
167 | + e.preventDefault(); | |
164 | 168 | } |
165 | 169 | }); |
166 | 170 | |
... | ... | @@ -1250,7 +1254,11 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun |
1250 | 1254 | $.removeCookie('*'); |
1251 | 1255 | logged_in = false; |
1252 | 1256 | Main.showLogin(); |
1253 | - location.reload(); | |
1257 | + if(window.location.hash.indexOf('/resultados') !== -1){ | |
1258 | + window.location.hash = window.location.hash.split('/resultados')[0]; | |
1259 | + }else{ | |
1260 | + location.reload(); | |
1261 | + } | |
1254 | 1262 | e.preventDefault(); |
1255 | 1263 | }); |
1256 | 1264 | ... | ... |