diff --git a/js/main.js b/js/main.js
index e26ddac..5d1133d 100644
--- a/js/main.js
+++ b/js/main.js
@@ -18,13 +18,15 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
var loginButton;
+ var lastHash;
+
var participa = true;
//Detects for localhost settings
var patt = new RegExp(":3000/");
if(patt.test(window.location.href))
participa = false;
-
+
if(participa){
var host = 'http://www.participa.br';
var proposal_discussion = '103358'; //participa
@@ -226,15 +228,16 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
}
return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
},
- display_article: function(article_id) {
+ display_article: function(article_id, backTo) {
var url = host + '/api/v1/articles/' + article_id + '?private_token=' + Main.private_token;
$.getJSON(url).done(function( data ) {
- $('#article-container').html(articleTemplate(data.article));
+ $('#article-container .article-content').html(articleTemplate(data.article));
$('#article-container').show();
$('#proposal-categories').hide();
$('#proposal-group').hide();
$('nav').hide();
$('#content').hide();
+ $('#article-container .go-back').attr('href', backTo);
});
},
// inicio Eduardo
@@ -430,9 +433,10 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
},
locationHashChanged: function(){
var hash = window.location.hash;
- this.navigateTo(hash);
+ this.navigateTo(hash, lastHash);
+ lastHash = hash;
},
- navigateTo: function(hash){
+ navigateTo: function(hash, lastHash) {
var scrollTop = 0;
var $nav = $('nav[role="tabpanel"]');
var navOffset = $nav.offset();
@@ -458,7 +462,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
var isArticle = regexArticle.exec(hash) !== null;
if(isArticle) {
- this.display_article(hash.split('/')[2]);
+ this.display_article(hash.split('/')[2], lastHash);
}
if( isProposal ){
--
libgit2 0.21.2