Download as
Browse Code »

Commit d474355421b79fb7faa37862d495c0e59ef0fe67

Authored by Leonardo Merlin
2 parents e847b1bd a21791d2
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'merlin'

Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
js/main.js
  Diff comments   View file @d474355
... ... @@ -280,6 +280,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
280 280 $('#proposal-group').hide();
281 281 $('nav').hide();
282 282 $('#content').hide();
  283 + $('.content').removeClass('background'); /* Remove class background*/
283 284 $('#article-container .go-back').attr('href', backTo);
284 285 });
285 286 },
... ... @@ -303,7 +304,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
303 304 $('#nav-proposal-group a').removeClass('active');
304 305 $('.proposal-category-items').hide();
305 306 $('.proposal-category .arrow-box').hide();
306   - $('.proposal-detail').hide();
  307 + $('.proposal-detail').hide().removeClass('hide');
307 308 $('#article-container').hide();
308 309  
309 310 $('#content').show();
... ... @@ -318,9 +319,11 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
318 319 $('#proposal-group').show();
319 320 $('#proposal-categories').show();
320 321 $('.proposal-category-items').hide();
  322 + $('.proposal-detail').hide().removeClass('hide');
321 323 $('#nav-proposal-group a').addClass('active');
322 324 $('#nav-proposal-categories a').removeClass('active');
323 325 $('#content').show();
  326 + $('.content').addClass('background'); /* Add class background */
324 327 $('#article-container').hide();
325 328 $('nav').show();
326 329 $('html, body').animate({ scrollTop: $('#proposal-group').offset().top }, 'fast');
... ... @@ -338,7 +341,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
338 341 $('#article-container').hide();
339 342 // $('.make-proposal-form').hide();
340 343 // $('.login-container').hide();
341   - $('.proposal-detail').hide(); // hide all proposals
  344 + $('.proposal-detail').hide().removeClass('hide'); // hide all proposals
342 345 // $('.proposal-detail-base').hide();
343 346 var $proposal = $('#' + proposal_id);
344 347 $proposal.find('.proposal-detail-base').hide();
... ... @@ -416,7 +419,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
416 419 $('#proposal-group').hide(); /* Hide section "Programas" */
417 420 $('.content').addClass('background'); /* Add class background */
418 421 $('.proposal-category-items').hide();
419   - $('.proposal-detail').hide();
  422 + $('.proposal-detail').hide().removeClass('hide');
420 423 $item.toggle( 'blind', 200, function () {
421 424 var itemOffset = $item.offset();
422 425 if(itemOffset){
... ...