Download as
Browse Code »

Commit 1e30d1ff6a68c1f9ad94940f9ee3f39b5ace4026

Authored by Leandro Santos
2 parents 022150d0 a99b329e
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

Merge branch 'master' of gitlab.com:participa/proposal-app

Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
js/main.js
  Diff comments   View file @1e30d1f
... ... @@ -88,15 +88,18 @@ $.getJSON(noosferoAPI)
88 88  
89 89 $( '.send-button a' ).click(function(event){
90 90 //display form to send proposal (or login form for non-logged users)
91   - loginButton = $(this).parents('.send-button');
  91 + var $this = $(this);
  92 + loginButton = $this.parents('.send-button');
92 93 loginButton.hide();
93   - $('.success-proposal-sent').hide();
  94 + $this.parents('.success-proposal-sent').hide();
94 95 loginCallback(logged_in);
95 96 event.preventDefault();
96 97 });
  98 +
97 99 $( '#display-contrast' ).click(function(event){
98 100 $('#proposal-result').toggleClass('contrast');
99 101 });
  102 +
100 103 $( '.show_body a' ).click(function(event){
101 104 event.preventDefault();
102 105  
... ... @@ -349,6 +352,8 @@ function display_proposal_by_category(item){
349 352 $('nav').show();
350 353 $('#content').show();
351 354 $('#proposal-categories').show();
  355 + $('#nav-proposal-categories a').addClass('active');
  356 + $('#nav-proposal-group a').removeClass('active');
352 357 $('.proposal-category-items').hide();
353 358 $('.proposal-detail').hide();
354 359 $item.show();
... ...