Commit ee436cf96aebd2c157fe05148d0262d7209cf74e
Exists in
master
and in
2 other branches
Merge branch 'fix-share'
Showing
3 changed files
with
19 additions
and
3 deletions
Show diff stats
index.html
| @@ -163,7 +163,7 @@ | @@ -163,7 +163,7 @@ | ||
| 163 | <a href="#/programas">Programas</a> | 163 | <a href="#/programas">Programas</a> |
| 164 | </div> | 164 | </div> |
| 165 | <div class="social top"> | 165 | <div class="social top"> |
| 166 | - {{#social_share "Dialoga Brasil" "Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo" "#" "http://dialoga.gov.br/images/logo.png"}}{{/social_share}} | 166 | + {{#social_share "Dialoga Brasil" "Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo" "#" "/images/logo.png"}}{{/social_share}} |
| 167 | </div> | 167 | </div> |
| 168 | </header> | 168 | </header> |
| 169 | 169 |
js/handlebars-helpers.js
| @@ -109,6 +109,12 @@ define(['handlebars'], function(Handlebars){ | @@ -109,6 +109,12 @@ define(['handlebars'], function(Handlebars){ | ||
| 109 | url = ''; | 109 | url = ''; |
| 110 | } | 110 | } |
| 111 | url = 'http:'+Url.addBaseUrl(url); | 111 | url = 'http:'+Url.addBaseUrl(url); |
| 112 | + | ||
| 113 | + // check host of image url | ||
| 114 | + if(image_url && !image_url.match('^' + Main.host)){ | ||
| 115 | + image_url = window.Main.host + image_url; | ||
| 116 | + } | ||
| 117 | + | ||
| 112 | return template({title: title, description: description, url: url, image_url: image_url}); | 118 | return template({title: title, description: description, url: url, image_url: image_url}); |
| 113 | }); | 119 | }); |
| 114 | 120 |
js/main.js
| @@ -71,8 +71,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -71,8 +71,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 71 | 71 | ||
| 72 | var API = { | 72 | var API = { |
| 73 | articles: '', | 73 | articles: '', |
| 74 | - proposals: '/api/v1/articles/{topic_id}/children', | ||
| 75 | - | 74 | + proposals: '/api/v1/articles/{topic_id}/children' |
| 76 | }; | 75 | }; |
| 77 | 76 | ||
| 78 | API.getProposalsURL = function (topicId){ | 77 | API.getProposalsURL = function (topicId){ |
| @@ -97,6 +96,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -97,6 +96,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 97 | 96 | ||
| 98 | return { | 97 | return { |
| 99 | private_token: null, | 98 | private_token: null, |
| 99 | + host: host, | ||
| 100 | getProposalId: function() { | 100 | getProposalId: function() { |
| 101 | var regexProposals = /\d.*\/propostas\/*.*/; | 101 | var regexProposals = /\d.*\/propostas\/*.*/; |
| 102 | var proposalId = 0; | 102 | var proposalId = 0; |
| @@ -145,6 +145,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -145,6 +145,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 145 | var article = data.articles[0]; | 145 | var article = data.articles[0]; |
| 146 | var $parentContainer = $('#proposal-item-'+topic_id); | 146 | var $parentContainer = $('#proposal-item-'+topic_id); |
| 147 | var parentTitle = $parentContainer.find('.proposal-header .title').text(); | 147 | var parentTitle = $parentContainer.find('.proposal-header .title').text(); |
| 148 | + | ||
| 148 | var parentImage = $parentContainer.find('.proposal-header img').attr('src'); | 149 | var parentImage = $parentContainer.find('.proposal-header img').attr('src'); |
| 149 | article.parent = {id: topic_id, title: parentTitle, image_url: parentImage}; | 150 | article.parent = {id: topic_id, title: parentTitle, image_url: parentImage}; |
| 150 | $randomProposal.html(supportProposalTemplate(article)); | 151 | $randomProposal.html(supportProposalTemplate(article)); |
| @@ -635,11 +636,15 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -635,11 +636,15 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 635 | var isActivateUser = regexActivateUser.exec(hash) !== null; | 636 | var isActivateUser = regexActivateUser.exec(hash) !== null; |
| 636 | var isChangeUserPassword = regexChangeUserPassword.exec(hash) !== null; | 637 | var isChangeUserPassword = regexChangeUserPassword.exec(hash) !== null; |
| 637 | 638 | ||
| 639 | + // set default picture url of social share | ||
| 640 | + $('.social.top .fb-share').attr('data-picture', host + '/images/logo.png').data('picture', host + '/images/logo.png'); | ||
| 641 | + | ||
| 638 | if(isArticle) { | 642 | if(isArticle) { |
| 639 | this.display_article(hash.split('/')[2], lastHash); | 643 | this.display_article(hash.split('/')[2], lastHash); |
| 640 | } | 644 | } |
| 641 | 645 | ||
| 642 | var proposalTitle; | 646 | var proposalTitle; |
| 647 | + var proposalImage; | ||
| 643 | 648 | ||
| 644 | if( isProposal ){ | 649 | if( isProposal ){ |
| 645 | 650 | ||
| @@ -649,6 +654,11 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | @@ -649,6 +654,11 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers | ||
| 649 | 654 | ||
| 650 | var $proposal = $('#proposal-item-' + proposalId); | 655 | var $proposal = $('#proposal-item-' + proposalId); |
| 651 | proposalTitle = $proposal.find('.title').text(); | 656 | proposalTitle = $proposal.find('.title').text(); |
| 657 | + proposalImage = $proposal.find('.abstract img').attr('src'); | ||
| 658 | + | ||
| 659 | + // set social share (fb) picture | ||
| 660 | + $('.social.top .fb-share').attr('data-picture', proposalImage).data('picture', proposalImage); | ||
| 661 | + | ||
| 652 | var proposalOffset = $proposal.offset(); | 662 | var proposalOffset = $proposal.offset(); |
| 653 | 663 | ||
| 654 | if(proposalOffset){ | 664 | if(proposalOffset){ |