From 6db15510dbd9b420df197a62fe149153dae4399b Mon Sep 17 00:00:00 2001 From: Vegaslon Date: Mon, 10 Feb 2020 16:20:22 -0500 Subject: [PATCH] Change name of variable and fix indention --- .../qml/hifi/avatarapp/AvatarsModel.qml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml index d65e8e21ae..c04efc9562 100644 --- a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml +++ b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml @@ -22,7 +22,7 @@ ListModel { return marketItemUrl; } - function makeMarketThumbnailUrl(marketId) { + function makeMarketThumbnailUrl(marketId) { var avatarThumbnailUrl = "https://hifi-metaverse.s3-us-west-1.amazonaws.com/marketplace/previews/%marketId%/large/hifi-mp-%marketId%.jpg" .split('%marketId%').join(marketId); @@ -30,14 +30,14 @@ ListModel { } function trimFileExtension(url) { - url = url.substring(0, (url.indexOf("#") == -1) ? url.length : url.indexOf("#")); - url = url.substring(0, (url.indexOf("?") == -1) ? url.length : url.indexOf("?")); - url = url.substring(0, url.lastIndexOf(".")); + var trimmedUrl = url.substring(0, (url.indexOf("#") == -1) ? url.length : url.indexOf("#")); + trimmedUrl = trimmedUrl.substring(0, (trimmedUrl.indexOf("?") == -1) ? trimmedUrl.length : trimmedUrl.indexOf("?")); + trimmedUrl = trimmedUrl.substring(0, trimmedUrl.lastIndexOf(".")); - return url; + return trimmedUrl; } - function imageExists(image_url){ + function imageExists(image_url){ var http = new XMLHttpRequest(); @@ -55,9 +55,9 @@ ListModel { } var avatarThumbnailFileUrl = trimFileExtension(avatarUrl)+".jpg"; - var exists= imageExists(avatarThumbnailFileUrl); + var thumbnailExist = imageExists(avatarThumbnailFileUrl); - if (!exists) { + if (!thumbnailExist) { return ''; }