Download as
Browse Code »

Commit 95803786e07cc4a14725097702ca953593b7042d

Authored by Leonardo Merlin
1 parent 0514d1ee
Exists in master and in 2 other branches production, staging

Fix host of pictures

Showing 2 changed files with 9 additions and 2 deletions   Show diff stats
js/handlebars-helpers.js
  Diff comments   View file @9580378
@@ -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
@@ -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));