Download as
Browse Code »

Commit f8ee44fec17dedbe1f25bb1ad821c204bbe01f6e

Authored by Leandro Santos
2 parents 3e5d0243 cad89d00
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

fixing conflit

Showing 1 changed file with 4 additions and 6 deletions   Show diff stats
js/main.js
  Diff comments   View file @f8ee44f
... ... @@ -319,10 +319,10 @@ define(['handlebars'], function(Handlebars){
319 319 loginButton.siblings('.login-container').show();
320 320 }
321 321 }
322   -
323   - // function oauthPluginHandleLoginResult(loggedIn, token) {
324   - // loginCallback(loggedIn, token);
325   - // }
  322 +
  323 + function oauthPluginHandleLoginResult(loggedIn, token) {
  324 + loginCallback(loggedIn, token);
  325 + }
326 326  
327 327 function guid() {
328 328 function s4() {
... ... @@ -330,8 +330,6 @@ define(['handlebars'], function(Handlebars){
330 330 .toString(16)
331 331 .substring(1);
332 332 }
333   - return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
334   - s4() + '-' + s4() + s4() + s4();
335 333 }
336 334  
337 335 function display_category_tab(){
... ...