Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -589,8 +589,6 @@ function resolveProductImageUrl(item) {
|
||||
|
||||
async function resolveProductImageUrlForCarousel(item) {
|
||||
const resolved = resolveProductImageUrl(item)
|
||||
const fullUrl = String(resolved.fullUrl || '').trim()
|
||||
if (fullUrl) return fullUrl
|
||||
const contentUrl = String(resolved.contentUrl || '').trim()
|
||||
if (contentUrl) {
|
||||
try {
|
||||
@@ -605,6 +603,8 @@ async function resolveProductImageUrlForCarousel(item) {
|
||||
// fall through to public url
|
||||
}
|
||||
}
|
||||
const fullUrl = String(resolved.fullUrl || '').trim()
|
||||
if (fullUrl) return fullUrl
|
||||
const publicUrl = String(resolved.publicUrl || '').trim()
|
||||
return String(publicUrl || fullUrl || contentUrl || '').trim()
|
||||
}
|
||||
|
||||
@@ -576,8 +576,6 @@ function resolveProductImageUrl(item) {
|
||||
|
||||
async function resolveProductImageUrlForCarousel(item) {
|
||||
const resolved = resolveProductImageUrl(item)
|
||||
const fullUrl = String(resolved.fullUrl || '').trim()
|
||||
if (fullUrl) return fullUrl
|
||||
const contentUrl = String(resolved.contentUrl || '').trim()
|
||||
if (contentUrl) {
|
||||
try {
|
||||
@@ -592,6 +590,8 @@ async function resolveProductImageUrlForCarousel(item) {
|
||||
// fall through to public url
|
||||
}
|
||||
}
|
||||
const fullUrl = String(resolved.fullUrl || '').trim()
|
||||
if (fullUrl) return fullUrl
|
||||
const publicUrl = String(resolved.publicUrl || '').trim()
|
||||
return String(publicUrl || fullUrl || contentUrl || '').trim()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user