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

Compare commits

base: OpenNeo:8e269df3c1c93d0f924e3409b396776f82c8ebe8
Branches Tags
OpenNeo:main
OpenNeo:modeling-tests
OpenNeo:rainbow-pool
OpenNeo:simpler-item-previews
..
compare: OpenNeo:bd4b67316c9b374e64ce336288ed572421d2f80b
Branches Tags
OpenNeo:main
OpenNeo:modeling-tests
OpenNeo:rainbow-pool
OpenNeo:simpler-item-previews

No commits in common. "8e269df3c1c93d0f924e3409b396776f82c8ebe8" and "bd4b67316c9b374e64ce336288ed572421d2f80b" have entirely different histories.
8e269df3c1 ... bd4b67316c

2 changed files with 4 additions and 8 deletions
Show stats Expand all files Collapse all files

6
app/javascript/wardrobe-2020/ItemPage/SpeciesFacesPicker.js
View file

@ -266,10 +266,10 @@ const SpeciesFaceOption = React.memo(
`} `}
> >
<CrossFadeImage <CrossFadeImage
src={`https://pets.neopets.com/cp/${neopetsImageHash}/${emotionId}/1.png`} src={`https://pets.neopets-asset-proxy.openneo.net/cp/${neopetsImageHash}/${emotionId}/1.png`}
srcSet={ srcSet={
`https://pets.neopets.com/cp/${neopetsImageHash}/${emotionId}/1.png 1x, ` + `https://pets.neopets-asset-proxy.openneo.net/cp/${neopetsImageHash}/${emotionId}/1.png 1x, ` +
`https://pets.neopets.com/cp/${neopetsImageHash}/${emotionId}/6.png 2x` `https://pets.neopets-asset-proxy.openneo.net/cp/${neopetsImageHash}/${emotionId}/6.png 2x`
} }
alt={speciesName} alt={speciesName}
width={55} width={55}

6
app/javascript/wardrobe-2020/util.js
View file

@ -161,11 +161,7 @@ export function safeImageUrl(
archiveUrl.search = new URLSearchParams({ url: url.toString() }); archiveUrl.search = new URLSearchParams({ url: url.toString() });
url = archiveUrl; url = archiveUrl;
} else if (crossOrigin) { } else if (crossOrigin) {
// NOTE: Previously we would rewrite this to our proxy that adds an url.host = "images.neopets-asset-proxy.openneo.net";
// `Access-Control-Allow-Origin` header (images.neopets-asset-proxy.
// openneo.net), but images.neopets.com now includes this header for us!
//
// So, do nothing!
} }
} else if ( } else if (
url.origin === "http://pets.neopets.com" || url.origin === "http://pets.neopets.com" ||