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