Download as
Browse Code »

Commit 96ef2db0202263e3a5992b6d2fee78ad3b6bb6ba

Authored by Michel Felipe
1 parent 9c599ec5
Exists in master and in 2 other branches production, staging

Fix bug to login after user confirmation

Showing 1 changed file with 7 additions and 3 deletions   Show diff stats
js/main.js
  Diff comments   View file @96ef2db
... ... @@ -325,7 +325,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
325 325 }
326 326 } else if (user) {
327 327 // fluxo signup vindo das caixas de login dentro dos programas
328   - if(requireLoginContainer.length > 0){
  328 + if(requireLoginContainer && requireLoginContainer.length > 0){
329 329 var loginContainer = requireLoginContainer.find('.login-container');
330 330 loginContainer.show();
331 331 loginContainer.find('.new-user').click();
... ... @@ -337,8 +337,11 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
337 337 fillSignupForm($signupForm, user);
338 338 }
339 339 } else {
340   - requireLoginContainer.find('.require-login').hide();
341   - requireLoginContainer.find('.login-container').show();
  340 +
  341 + if(requireLoginContainer){
  342 + requireLoginContainer.find('.require-login').hide();
  343 + requireLoginContainer.find('.login-container').show();
  344 + }
342 345 Main.showLogin();
343 346 }
344 347 },
... ... @@ -977,6 +980,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
977 980 if(data.person){
978 981 Main.setUser({person: data.person});
979 982 }
  983 + data = data.user || data;
980 984 Main.loginCallback(data.activated, data.private_token);
981 985 },
982 986 handleLoginFail: function (e){
... ...