diff --git a/js/main.js b/js/main.js index 909e69f..1c5ce28 100644 --- a/js/main.js +++ b/js/main.js @@ -1,3 +1,4 @@ +/* global Handlebars, $ */ // The template code var templateSource = document.getElementById('proposal-template').innerHTML; @@ -10,8 +11,6 @@ var resultsTemplate = Handlebars.compile(document.getElementById('results').inne // The div/container that we are going to display the results in var resultsPlaceholder = document.getElementById('proposal-result'); -var topics; - var logged_in = false; var loginButton; @@ -48,8 +47,8 @@ $.getJSON(noosferoAPI) navigateTo(window.location.hash); //Actions for links - $( '#nav-proposal-categories a' ).on('click touchstart', function(event){ - event.preventDefault(); + $( '#nav-proposal-categories a' ).on('click touchstart', function(e){ + e.preventDefault(); var $link = $(this); @@ -57,8 +56,8 @@ $.getJSON(noosferoAPI) updateHash($link.attr('href')); }); - $( '#nav-proposal-group a' ).on('click touchstart', function(event){ - event.preventDefault(); + $( '#nav-proposal-group a' ).on('click touchstart', function(e){ + e.preventDefault(); var $link = $(this); @@ -66,26 +65,26 @@ $.getJSON(noosferoAPI) updateHash($link.attr('href')); }); - $( '.proposal-item a' ).on('click touchstart', function(event){ + $( '.proposal-item a' ).on('click touchstart', function(e){ + e.preventDefault(); + var $link = $(this); - var item = $link.data('target'); // Update URL and Navigate updateHash($link.attr('href')); }); - $( '.proposal-category a' ).on('click touchstart', function(event){ - event.preventDefault(); + $( '.proposal-category a' ).on('click touchstart', function(e){ + e.preventDefault(); var $link = $(this); - var item = $link.data('target'); // Update URL and Navigate updateHash($link.attr('href')); }); - $( '.proposal-category .go-back' ).on('click touchstart', function(event){ - event.preventDefault(); + $( '.proposal-category .go-back' ).on('click touchstart', function(e){ + e.preventDefault(); var oldHash = window.location.hash; var regexSubpages = /sobre-o-programa$/; @@ -121,7 +120,6 @@ $.getJSON(noosferoAPI) e.preventDefault(); var $link = $(this); - var item = $link.data('target'); // Update URL and Navigate updateHash($link.attr('href')); @@ -131,7 +129,6 @@ $.getJSON(noosferoAPI) e.preventDefault(); var $link = $(this); - var item = $link.data('target'); // Update URL and Navigate updateHash($link.attr('href')); @@ -176,7 +173,7 @@ $.getJSON(noosferoAPI) url: host + '/api/v1/articles/' + proposal_id + '/children', data: $('#'+this.id).serialize() + '&private_token=' + private_token + '&fields=id&article[name]=article_' + guid() }) - .done(function( data ) { + .done(function( /*data*/ ) { form.reset(); $form.hide(); $form.siblings('.success-sent').show(); @@ -231,7 +228,7 @@ function loadRandomProposal(topic_id, private_token) { value: $(this).data('vote-value'), private_token: private_token } - }).done(function( data ) { + }).done(function( /*data*/ ) { loadRandomProposal(topic_id, private_token); }); e.preventDefault(); @@ -267,45 +264,21 @@ function loadRandomProposal(topic_id, private_token) { $('.experience-proposal-container').show(); $('.talk-proposal-container').show(); } - + e.preventDefault(); }); }); } -jQuery(document).ready(function($) { +$(document).ready(function($) { if($.cookie('_dialoga_session')) { var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session'); - $.getJSON(url).done(function( data ) { + $.getJSON(url).done(function( /*data*/ ) { logged_in = true; private_token = $.cookie('_dialoga_session'); }); } -}); -function loginCallback(loggedIn, token) { - logged_in = loggedIn; - $('.login .message').text(''); - - if(logged_in) { - if(token){ - private_token = token; - } - loginButton.siblings('.save-article-form').show(); - loginButton.siblings('.save-article-form .message').show(); - loginButton.siblings('.login-container').hide(); - $.cookie('_dialoga_session', private_token); - } else { - loginButton.siblings('.save-article-form').hide(); - loginButton.siblings('.login-container').show(); - } -} - -function oauthPluginHandleLoginResult(loggedIn, token) { - loginCallback(loggedIn, token); -} - -jQuery(document).ready(function($) { $(document).on('click', '.login-action', function(e) { var message = $('.login .message'); message.hide(); @@ -319,7 +292,7 @@ jQuery(document).ready(function($) { } }).done(function(data) { loginCallback(true, data.private_token); - }).fail(function(data) { + }).fail(function( /*data*/ ) { message.show(); message.text('Não foi possível logar'); }); @@ -327,6 +300,28 @@ jQuery(document).ready(function($) { }); }); +function loginCallback(loggedIn, token) { + logged_in = loggedIn; + $('.login .message').text(''); + + if(logged_in) { + if(token){ + private_token = token; + } + loginButton.siblings('.save-article-form').show(); + loginButton.siblings('.save-article-form .message').show(); + loginButton.siblings('.login-container').hide(); + $.cookie('_dialoga_session', private_token); + } else { + loginButton.siblings('.save-article-form').hide(); + loginButton.siblings('.login-container').show(); + } +} + +// function oauthPluginHandleLoginResult(loggedIn, token) { +// loginCallback(loggedIn, token); +// } + function guid() { function s4() { return Math.floor((1 + Math.random()) * 0x10000) -- libgit2 0.21.2