From 917fa328d38c82b6fb78174d4e1f3895c3134d75 Mon Sep 17 00:00:00 2001 From: Roberto Tonino Date: Tue, 28 Apr 2020 20:51:14 +0200 Subject: [PATCH] replaced v-bind directive with shorthand --- public/index.html | 105 ++++++++++++++++++------------------- public/js/modules/utils.js | 11 ++-- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/public/index.html b/public/index.html index 3d3fb4e..0c593d8 100644 --- a/public/index.html +++ b/public/index.html @@ -57,11 +57,11 @@

{{ names[section] }}

- +
get_app
+ @click="addToQueue" :data-link="results.allTab.TOP_RESULT[0].link" class="download_overlay">get_app

{{ results.allTab.TOP_RESULT[0].title }}

@@ -76,17 +76,17 @@

{{ names[section] }}

- - @@ -94,12 +94,12 @@

{{ names[section] }}

+ @click="artistView" :data-id="release.ART_ID">
+ :src="'https://e-cdns-images.dzcdn.net/images/artist/' + release.ART_PICTURE + '/156x156-000000-80-0-0.jpg'">
get_app

{{release.ART_NAME}}

@@ -108,12 +108,12 @@

{{ names[section] }}

+ @click="albumView" :data-id="release.ALB_ID">
+ :src="'https://e-cdns-images.dzcdn.net/images/cover/' + release.ALB_PICTURE + '/156x156-000000-80-0-0.jpg'">
get_app

{{release.ALB_TITLE}}

@@ -122,12 +122,12 @@

{{ names[section] }}

+ @click="playlistView" :data-id="release.PLAYLIST_ID">
+ :src="'https://e-cdns-images.dzcdn.net/images/'+ release.PICTURE_TYPE +'/' + release.PLAYLIST_PICTURE + '/156x156-000000-80-0-0.jpg'">
get_app

{{ release.TITLE }}

@@ -160,21 +160,19 @@

No Tracks found

- - @@ -190,11 +188,11 @@

No Albums found

+ :data-id="release.id">
- +
get_app

{{ release.title }}

@@ -212,11 +210,11 @@

No Artists found

+ :data-id="release.id">
- +
get_app

{{ release.name }}

@@ -234,11 +232,11 @@

No Playlists found

+ :data-id="release.id">
- +
get_app

{{ release.title }}

@@ -521,15 +519,15 @@

About

@@ -538,16 +536,16 @@

{{ title }}

- - @@ -569,7 +567,7 @@

{{ title }}

 @@ -587,15 +585,15 @@

{{ metadata }}

+ :class="'material-icons' + (track.preview ? ' preview_playlist_controls' : '')" + :data-preview="track.preview">play_arrow - - @@ -610,11 +608,10 @@

{{ metadata }}{{ label }}
- + :data-link="selectedLinks()">Download selectionfile_download
diff --git a/public/js/modules/utils.js b/public/js/modules/utils.js index a58bcb4..93aa971 100644 --- a/public/js/modules/utils.js +++ b/public/js/modules/utils.js @@ -1,8 +1,13 @@ function isValidURL(text) { - if (text.toLowerCase().startsWith('http')) { - if (text.toLowerCase().indexOf('deezer.com') >= 0 || text.toLowerCase().indexOf('open.spotify.com') >= 0) + let lowerCaseText = text.toLowerCase() + + if (lowerCaseText.startsWith('http')) { + if (lowerCaseText.indexOf('deezer.com') >= 0 || lowerCaseText.indexOf('open.spotify.com') >= 0) { return true - } else if (text.toLowerCase().startsWith('spotify:')) return true + } + } else if (lowerCaseText.startsWith('spotify:')) { + return true + } return false }

+ :src="'https://e-cdns-images.dzcdn.net/images/cover/'+track.ALB_PICTURE+'/32x32-000000-80-0-0.jpg'"> {{track.SNG_TITLE + (track.VERSION ? ' '+track.VERSION : '')}}{{artist.ART_NAME}} + {{artist.ART_NAME}} + {{track.ALB_TITLE}} {{convertDuration(track.DURATION)}} get_app
- play_arrow + play_arrow {{track.title + (track.title_version ? ' '+track.title_version : '')}} + {{track.artist.name}} + {{track.album.title}} {{convertDuration(track.duration)}} get_app
+ :style="{ 'width': data.width ? data.width : 'auto'}" + :class="{ 'sort-asc': data.sortKey == sortKey && sortOrder == 'asc', 'sort-desc': data.sortKey == sortKey && sortOrder == 'desc', 'sortable': data.sortKey, 'clickable': data.sortKey }"> {{data.title}}
- + explicit @@ -556,7 +554,7 @@

{{ title }}

style="color:#FF7300;">fiber_new 		{{release.release_date}}file_download
+
play_arrow{{ track.track_position }} explicit{{ track.title + (track.title_version && track.title.indexOf(track.title_version) == -1 ? ' '+track.title_version : '') }} + {{ track.artist.name }} + {{ track.album.title }} {{ convertDuration(track.duration) }}