Commit 95803786e07cc4a14725097702ca953593b7042d
1 parent
0514d1ee
Exists in
master
and in
2 other branches
Fix host of pictures
Showing
2 changed files
with
9 additions
and
2 deletions
Show diff stats
js/handlebars-helpers.js
| ... | ... | @@ -109,6 +109,12 @@ define(['handlebars'], function(Handlebars){ |
| 109 | 109 | url = ''; |
| 110 | 110 | } |
| 111 | 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 | 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 | 71 | |
| 72 | 72 | var API = { |
| 73 | 73 | articles: '', |
| 74 | - proposals: '/api/v1/articles/{topic_id}/children', | |
| 75 | - | |
| 74 | + proposals: '/api/v1/articles/{topic_id}/children' | |
| 76 | 75 | }; |
| 77 | 76 | |
| 78 | 77 | API.getProposalsURL = function (topicId){ |
| ... | ... | @@ -97,6 +96,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers |
| 97 | 96 | |
| 98 | 97 | return { |
| 99 | 98 | private_token: null, |
| 99 | + host: host, | |
| 100 | 100 | getProposalId: function() { |
| 101 | 101 | var regexProposals = /\d.*\/propostas\/*.*/; |
| 102 | 102 | var proposalId = 0; |
| ... | ... | @@ -145,6 +145,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers |
| 145 | 145 | var article = data.articles[0]; |
| 146 | 146 | var $parentContainer = $('#proposal-item-'+topic_id); |
| 147 | 147 | var parentTitle = $parentContainer.find('.proposal-header .title').text(); |
| 148 | + | |
| 148 | 149 | var parentImage = $parentContainer.find('.proposal-header img').attr('src'); |
| 149 | 150 | article.parent = {id: topic_id, title: parentTitle, image_url: parentImage}; |
| 150 | 151 | $randomProposal.html(supportProposalTemplate(article)); | ... | ... |