Download as
Browse Code »

Commit 1c489342665413f45e494fd4a6aba43df255db41

Authored by Victor Costa
1 parent 1b5da184
Exists in master and in 8 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, production, staging

Fix merge 

Fix merge (Commit 76e5124df273ceafbd27f434c2c24de9866334e9)
Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
js/main.js
  Diff comments   View file @1c48934
... ... @@ -134,7 +134,8 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
134 134 $( '.proposal-selection' ).change(function(e){
135 135 e.preventDefault();
136 136  
137   - Main.display_proposal('proposal-item-' + this.value);
  137 + // Update URL and Navigate
  138 + Main.updateHash('#/programas/' + this.value);
138 139 });
139 140  
140 141 var availableTags = [ ];
... ... @@ -366,11 +367,11 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
366 367 $('.results-container').hide();
367 368 $('.experience-proposal-container').hide();
368 369 $('.talk-proposal-container').hide();
369   - $('.body').show();
  370 + $('#proposal-item-' + proposal_id + ' .body').show();
370 371  
371 372 var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
372 373 $.getJSON(url).done(function( data ) {
373   - $('.body-content').replaceWith(data.article.body);
  374 + $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body);
374 375 })
375 376 .fail(function( jqxhr, textStatus, error ) {
376 377 var err = textStatus + ', ' + error;
... ...