OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

use proper absolute url for image urls

Browse source
This commit is contained in:
Emi Matchu 2012-07-31 11:34:28 -04:00
parent 4dd2bc9549
commit d2d6bb7fd5
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
public/javascripts/outfits/edit.js
View file

@ -631,14 +631,17 @@ View.Outfits = function (wardrobe) {
wardrobe.outfits.toggleOutfitStar(el.tmplItem().data); wardrobe.outfits.toggleOutfitStar(el.tmplItem().data);
}); });
function pathToUrl(path) { function absoluteUrl(path_or_url) {
var host = document.location.protocol + "//" + document.location.host; if(path_or_url.indexOf('://') == -1) {
if(document.location.port) host += ":" + document.location.port; var host = document.location.protocol + "//" + document.location.host;
return host + path; return host + path_or_url;
} else {
return path_or_url;
}
} }
function generateOutfitPermalink(outfit) { function generateOutfitPermalink(outfit) {
return pathToUrl("/outfits/" + outfit.id); return absoluteUrl("/outfits/" + outfit.id);
} }
function setOutfitPermalink(outfit, outfit_permalink_el, outfit_url_el) { function setOutfitPermalink(outfit, outfit_permalink_el, outfit_url_el) {
@ -785,9 +788,9 @@ View.Outfits = function (wardrobe) {
// to discover if this is a new outfit ID or not fails. // to discover if this is a new outfit ID or not fails.
current_shared_outfit = outfit.clone(); current_shared_outfit = outfit.clone();
urls.permalink = generateOutfitPermalink(outfit); urls.permalink = generateOutfitPermalink(outfit);
urls.small_image = pathToUrl(outfit.image_versions.small); urls.small_image = absoluteUrl(outfit.image_versions.small);
urls.medium_image = pathToUrl(outfit.image_versions.medium); urls.medium_image = absoluteUrl(outfit.image_versions.medium);
urls.large_image = pathToUrl(outfit.image_versions.large); urls.large_image = absoluteUrl(outfit.image_versions.large);
formatUrls(); formatUrls();
WRAPPER.removeClass('thumbnail-available'); WRAPPER.removeClass('thumbnail-available');
subscribeToImageIfVisible(current_shared_outfit); subscribeToImageIfVisible(current_shared_outfit);