Fix 'go back to results' (fix #304)

Leonardo Merlin
1 parent da015b9f
Showing 2 changed files with 43 additions and 17 deletions Show diff stats
index.html
js/main.js
@@ -367,7 +367,7 @@
             <a href="#" class="skip button box-footer">Pular</a>
           </div>
         </div>
-        <a href="#" class="vote-result box-bottom">Resultados</a>
+        <a href="#/programas/{{parent.id}}/resultados" class="vote-result box-bottom">Resultados</a>
       </div>
       <div class="social">
         <span>Compartilhe esta proposta</span>
@@ -18,7 +18,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
   var loginButton;
-  var lastHash;
+  var lastHash = window.location.hash;
   var participa = true;
@@ -137,6 +137,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
             $body.off('click', '.vote-result');
             $body.on('click', '.vote-result', function(e) {
+              // e.preventDefault();
+
               var $this = $(this);
               var $proposalDetail = $this.parents('.proposal-detail');
               var $resultsContainer = $proposalDetail.find('.results-container');
@@ -144,12 +146,18 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               if($resultsContainer.css('display') === 'none') {
                 Main.loadRanking($resultsContainer, topic_id, 1);
               } else {
-                $('.experience-proposal-container').show();
-                $('.talk-proposal-container').show();
+                $proposalDetail.find('.experience-proposal-container').show();
+                $proposalDetail.find('.talk-proposal-container').show();
                 $resultsContainer.hide();
               }
-              e.preventDefault();
             });
+
+            // $body.off('click', '.question-link');
+            // $body.on('click', '.question-link', function(e) {
+            //   var $this = $(this);
+              
+            //   // Main.navigateTo($this.attr('href'), backTo);
+            // });
           }).fail(function(){
             $loading.hide();
             $('.support-proposal .alert').show();
@@ -197,10 +205,14 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
             $(this).toggleClass('truncated');
           });
+          var scrollTop = $(document).height();
+          var proposalOffset = $resultsContainer.offset();
+          if(proposalOffset){
+            scrollTop = proposalOffset.top;
+          }
+
           // scroll to the end
-          $('html, body').animate({
-            scrollTop: $(document).height()
-          }, 'fast');
+          $('html, body').animate({scrollTop: scrollTop }, 'fast');
         });
         $('.experience-proposal-container').hide();
         $('.talk-proposal-container').hide();
@@ -469,6 +481,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         var regexCategory = /#\/temas/;
         var regexHideBarra = /barra=false$/;
         var regexArticle = /#\/artigo/;
+        var regexResultados = /resultados$/;
         if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){
           this.addBarraDoGoverno();
@@ -484,6 +497,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         var isProposal = regexProposals.exec(hash) !== null;
         var isCategory = regexCategory.exec(hash) !== null;
         var isArticle  = regexArticle.exec(hash) !== null;
+        var isResultados  = regexResultados.exec(hash) !== null;
         if(isArticle) {
           this.display_article(hash.split('/')[2], lastHash);
@@ -506,6 +520,23 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               scrollTop = $('#proposal-group').offset().top;
             }
           }
+
+          if(isResultados){
+            var $resultsContainer = $proposal.find('.results-container');
+
+            if($resultsContainer.css('display') === 'none') {
+              Main.loadRanking($resultsContainer, proposalId, 1);
+            } else {
+              $proposalDetail.find('.experience-proposal-container').show();
+              $proposalDetail.find('.talk-proposal-container').show();
+              $resultsContainer.hide();
+            }
+
+            var proposalOffset = $resultsContainer.offset();
+            if(proposalOffset){
+              scrollTop = proposalOffset.top;
+            }
+          }
         }
         if( isCategory ){
@@ -529,20 +560,15 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         if( !isProposal && !isCategory ){
           // show the 'index' -> category tab
           this.display_category_tab();
-
-
-          // if(navOffset){
-          //   scrollTop = navOffset.top;
-          // }
         }
         $('html, body').animate({ scrollTop: scrollTop }, 'fast');
       },
       navigateToProposal: function(proposalId){
-        var regexSubpages = /sobre-o-programa$/;
+        var regexSobreOPrograma = /sobre-o-programa$/;
         if(proposalId === undefined){
           this.display_proposals_tab();
-        }else if(regexSubpages.exec(window.location.hash) == null){
+        }else if(regexSobreOPrograma.exec(window.location.hash) == null){
           this.display_proposal('proposal-item-' + proposalId);
         }else{
           this.display_proposal_detail(proposalId);
@@ -754,8 +780,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         e.preventDefault();
         var oldHash = window.location.hash;
-        var regexSubpages = /sobre-o-programa$/;
-        var isSubpage = regexSubpages.exec(oldHash) !== null;
+        var regexSobreOPrograma = /sobre-o-programa$/;
+        var isSubpage = regexSobreOPrograma.exec(oldHash) !== null;
         var newHash = '#/temas'; // default page
         if(isSubpage){
	@@ -367,7 +367,7 @@		@@ -367,7 +367,7 @@
367	<a href="#" class="skip button box-footer">Pular</a>	367	<a href="#" class="skip button box-footer">Pular</a>
368	</div>	368	</div>
369	</div>	369	</div>
370	- <a href="#" class="vote-result box-bottom">Resultados</a>	370	+ <a href="#/programas/{{parent.id}}/resultados" class="vote-result box-bottom">Resultados</a>
371	</div>	371	</div>
372	<div class="social">	372	<div class="social">
373	<span>Compartilhe esta proposta</span>	373	<span>Compartilhe esta proposta</span>