From 1c489342665413f45e494fd4a6aba43df255db41 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 30 Apr 2015 15:26:47 -0300
Subject: [PATCH] Fix merge

---
 js/main.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/main.js b/js/main.js
index e403472..04397a6 100644
--- a/js/main.js
+++ b/js/main.js
@@ -134,7 +134,8 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
       $( '.proposal-selection' ).change(function(e){
         e.preventDefault();
 
-        Main.display_proposal('proposal-item-' + this.value);
+        // Update URL and Navigate
+        Main.updateHash('#/programas/' + this.value);
       });
 
       var availableTags = [ ];
@@ -366,11 +367,11 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
             $('.results-container').hide();
             $('.experience-proposal-container').hide();
             $('.talk-proposal-container').hide();
-            $('.body').show();
+            $('#proposal-item-' + proposal_id + ' .body').show();
 
             var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
             $.getJSON(url).done(function( data ) {
-              $('.body-content').replaceWith(data.article.body);
+              $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body);
             })
             .fail(function( jqxhr, textStatus, error ) {
               var err = textStatus + ', ' + error;
--
libgit2 0.21.2