Commit e24bcb43 authored by Marc Mautz's avatar Marc Mautz

updated image url handling, added mixin "getImageUrl"

parent 09835b96
......@@ -13,7 +13,7 @@
</h2>
</div>
<div class="col-xs-12 col-md-8">
<img :src="'http://manufacturer-blueprint.workbench.oneba.se/filefly/api?action=stream&path=' + productData.image_url"
<img :src="getImageUrl(productData)"
class="img-responsive product-image"
:title="productData.heading"
:alt="productData.heading">
......
......@@ -15,8 +15,8 @@
<span class="subheading">{{ item.subheading }}</span>
</p>
</figcaption>
<div class="figure-img-wrap" :style="{backgroundImage: 'url(' + getImageUrl(item.image_url) + ')'}">
<loading-indicator v-if="item.image_url"></loading-indicator>
<div class="figure-img-wrap" :style="{backgroundImage: 'url(' + getImageUrl(item) + ')'}">
<loading-indicator v-if="item.image_url || item.absolute_image_url"></loading-indicator>
</div>
</figure>
</a>
......@@ -124,15 +124,6 @@
} else {
return this.settings.baseUrl + this.settings.detailPath + id
}
},
/**
* Get absolute image url
* @param imageUrl
* @returns {string}
*/
getImageUrl (imageUrl) {
// return this.settings.baseUrl + this.settings.imageApiPath + imageUrl
return this.settings.imgBaseUrl + '/' + this.settings.imgHostPrefix + imageUrl + this.settings.imgHostSuffix
}
}
}
......
......@@ -64,6 +64,24 @@ const VueShuffleJsPlugin = {
} else {
// console.info('$i18n is not installed...')
}
},
methods: {
/**
* Get absolute image url
* @desc if "useAbsoluteImageUrls" is set return "absolute_image_url", otherwise return concatenated "image_url"
* @param item
* @returns {string}
*/
getImageUrl (item) {
if (this.settings.useAbsoluteImageUrls) {
if (!item.absolute_image_url) {
throw Error('Missing "absolute_image_url" property!')
}
return item.absolute_image_url
}
return this.settings.imgBaseUrl + '/' + this.settings.imgHostPrefix + item.image_url + this.settings.imgHostSuffix
}
}
})
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment