Download as
Browse Code »

Commit c33ba845d8fe1bc6be0cb2811f448bf20a2728c1

Authored by Leandro Santos
1 parent 2de2dbb5
Exists in master and in 9 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, production, refactory-sass, staging

load proposal body dinamically

Showing 2 changed files with 15 additions and 6 deletions   Show diff stats
index.html
  Diff comments   View file @c33ba84
... ... @@ -152,7 +152,9 @@
152 152 </div>
153 153  
154 154 <div class="body proposal-detail-base hide">
155   - {{{body}}}
  155 + <div class='body-content'>
  156 + {{{body}}}
  157 + </div>
156 158 <div class="go-to-proposal-button">
157 159 <a href="#/programas/{{id}}" data-target="proposal-item-{{id}}">
158 160 <span class="fa fa-reply"></span>
... ...
js/main.js
  Diff comments   View file @c33ba84
... ... @@ -31,7 +31,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
31 31 }
32 32  
33 33 // Load data from localhost when it is dev env.
34   - var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,body,title,image,url';
  34 + var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,title,image,url';
35 35  
36 36 $.getJSON(noosferoAPI)
37 37 .done(function( data ) {
... ... @@ -388,7 +388,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
388 388 loadRandomProposal(topic_id, private_token);
389 389 }
390 390  
391   - function display_proposal_detail(){
  391 + function display_proposal_detail(proposal_id){
392 392 $('#proposal-categories').hide();
393 393 $('#proposal-group').hide();
394 394 $('nav').hide();
... ... @@ -400,10 +400,17 @@ define([&#39;handlebars&#39;], function(Handlebars){
400 400 $('.results-container').hide();
401 401 $('.experience-proposal-container').hide();
402 402 $('.talk-proposal-container').hide();
403   -
404 403 $('.body').show();
405   - }
406 404  
  405 + var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
  406 + $.getJSON(url).done(function( data ) {
  407 + $('.body-content').replaceWith(data.article.body);
  408 + })
  409 + .fail(function( jqxhr, textStatus, error ) {
  410 + var err = textStatus + ', ' + error;
  411 + console.log( 'Request Failed: ' + err );
  412 + });
  413 + }
407 414 function display_proposal_by_category(item){
408 415 var $item = $('#' + item);
409 416  
... ... @@ -540,7 +547,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
540 547 var regexSubpages = /sobre-o-programa$/;
541 548 var m;
542 549 if((m = regexSubpages.exec(window.location.hash)) !== null ){
543   - display_proposal_detail();
  550 + display_proposal_detail(proposalId);
544 551 }
545 552 }
546 553 }
... ...