Commit 6eb5a57850e4bda41a15d2b4ecc9fa9606df2869
Exists in
master
and in
5 other branches
Merge branch 'fix-navigation'
Showing
1 changed file
with
3 additions
and
2 deletions
Show diff stats
js/main.js
@@ -45,7 +45,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -45,7 +45,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
45 | //127.0.0.1 login.dialoga.gov.br | 45 | //127.0.0.1 login.dialoga.gov.br |
46 | //127.0.0.1 noosfero.com | 46 | //127.0.0.1 noosfero.com |
47 | //Detects for localhost settings | 47 | //Detects for localhost settings |
48 | - var patt = new RegExp(':300[0-2]/'); | 48 | + var patt = new RegExp(':300[0-2]/'); |
49 | var localDevelopment = false; | 49 | var localDevelopment = false; |
50 | 50 | ||
51 | if(patt.test(window.location.href)){ | 51 | if(patt.test(window.location.href)){ |
@@ -68,7 +68,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -68,7 +68,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
68 | recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/ | 68 | recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/ |
69 | cat_saude = 23; | 69 | cat_saude = 23; |
70 | } | 70 | } |
71 | - } | 71 | + } |
72 | 72 | ||
73 | 73 | ||
74 | var BARRA_ADDED = false; | 74 | var BARRA_ADDED = false; |
@@ -499,6 +499,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -499,6 +499,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
499 | $('.content').addClass('background'); /* Add class background */ | 499 | $('.content').addClass('background'); /* Add class background */ |
500 | $('.proposal-category-items').hide(); | 500 | $('.proposal-category-items').hide(); |
501 | $('.proposal-detail').hide().removeClass('hide'); | 501 | $('.proposal-detail').hide().removeClass('hide'); |
502 | + $('#article-container').hide(); | ||
502 | $item.toggle( 'blind', 200, function () { | 503 | $item.toggle( 'blind', 200, function () { |
503 | var itemOffset = $item.offset(); | 504 | var itemOffset = $item.offset(); |
504 | if(itemOffset){ | 505 | if(itemOffset){ |