Fix require login actions

Victor Costa
1 parent 2ae73809
Showing 2 changed files with 19 additions and 16 deletions Show diff stats
index.html
js/main.js
@@ -245,7 +245,7 @@
                   </div>
                   <div class="row">
-                    <div class="make-proposal-container col-sm-6">
+                    <div class="make-proposal-container col-sm-6 require-login-container">
                       <section class="make-proposal box box-propostas">
                         <div class="container-title box-title">Faça uma proposta</div>
                         <div class="subtitle box-subtitle">Qual a sua sugestão para melhorar este programa?</div>
@@ -276,7 +276,7 @@
                       </section>
                     </div>
-                    <div class="support-proposal-container col-sm-6">
+                    <div class="support-proposal-container col-sm-6 require-login-container">
                       <section class="support-proposal box box-propostas box-center box-apoie">
                         <div class="container-title box-title"> Apoie outras propostas</div>
                         <div class="alert alert-warning hide" role="alert">
@@ -288,7 +288,7 @@
                           <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
                         </div>
                         <div class="login-container hide">Login</div>
-                        <div class="send-button"><a href="#"><span>Login</span></a></div>
+                        <div class="button-send hide"><a href="#"><span>Login</span></a></div>
                       </section>
                     </div>
@@ -344,8 +344,8 @@
         <p class="box-subtitle">{{stripTags (trimString abstract 200)}}</p>
       </div>
       <div class="vote-actions">
-        <a href="#" class="icon icon-vote dislike" data-vote-value="-1"><span class="fa fa-times"></span></a>
-        <a href="#" class="icon icon-vote like" data-vote-value="1"><span class="fa fa-check"></span></a>
+        <a href="#" class="icon icon-vote vote-action dislike" data-vote-value="-1"><span class="fa fa-times"></span></a>
+        <a href="#" class="icon icon-vote vote-action like" data-vote-value="1"><span class="fa fa-check"></span></a>
         <div class="row">
           <div class="col-sm-6 col-sm-offset-3">
             <a href="#" class="skip button box-footer">Pular</a>
@@ -24,8 +24,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
   //Detects for localhost settings
   var patt = new RegExp(":3000/");
-  if(patt.test(window.location.href))
-    participa = false;
+  //if(patt.test(window.location.href))
+  //  participa = false;
   if(participa){
     var host = 'http://www.participa.br';
@@ -97,8 +97,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               contextMain.loadRandomProposal(topic_id);
               e.preventDefault();
             });
-            $body.off('click', '.vote-actions .like');
-            $body.on('click', '.vote-actions .like', function(e) {
+            $body.off('click', '.vote-actions .vote-action');
+            $body.on('click', '.vote-actions .vote-action', function(e) {
               //Helps to prevent more than one vote per proposal
               if(ProposalApp.hasProposalbeenVoted(article.id)){
                 console.log("Proposta " + article.id + " já havia sido votada");
@@ -108,7 +108,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
               }
               if(!logged_in) {
-                $(this).closest('.support-proposal').find('.button-send a').click();
+                $(this).closest('.require-login-container').find('.button-send a').click();
                 e.preventDefault();
                 return;
               }
@@ -196,17 +196,20 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
         loginCallback: function(loggedIn, token, user) {
           logged_in = loggedIn;
           $('.login .message').text('');
+          var requireLoginContainer = loginButton.closest('.require-login-container');
           if(logged_in) {
+            console.log('A');
             if(token){
               Main.private_token = token;
             }
-            loginButton.siblings('.require-login').show();
-            loginButton.siblings('.require-login .message').show();
-            loginButton.siblings('.login-container').hide();
+            requireLoginContainer.find('.require-login').show();
+            requireLoginContainer.find('.require-login .message').show();
+            requireLoginContainer.find('.login-container').hide();
             $.cookie('_dialoga_session', Main.private_token);
           } else if (user) {
-            var loginContainer = loginButton.siblings('.login-container');
+            console.log('B');
+            var loginContainer = requireLoginContainer.find('.login-container');
             loginContainer.show();
             loginContainer.find('.new-user').click();
             var signupForm = loginContainer.find('#signup-form');
@@ -216,8 +219,8 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
             //signupForm.find(".password").hide();
             //signupForm.find(".password-confirmation").hide();
           } else {
-            loginButton.siblings('.require-login').hide();
-            loginButton.siblings('.login-container').show();
+            requireLoginContainer.find('.require-login').hide();
+            requireLoginContainer.find('.login-container').show();
           }
         },
         guid: function() {