➕ merge pull request #121 from devmount/fix-song-tuning

Fix song tuning in song show view
devmount · May 11, 2022 · c75ea15 · c75ea15
2 parents 2112ff1 + 78401c1
commit c75ea15
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,7 @@
-# Custom Title
-
-## Requirements
-
+<!--
 * Filling out this template is required.
 * All new code must have been tested to ensure against regressions
+-->
 
 ## Description of the Change
 

diff --git a/src/assets/global.scss b/src/assets/global.scss
@@ -180,6 +180,9 @@ ion-icon {
 .bg-primary-dark {
 	background-color: $bg-color-dark;
 }
+.text-dark {
+	color: $gray-color-dark !important;
+}
 .text-gray {
 	color: $gray-color-600 !important;
 }

diff --git a/src/modals/SetlistSet.vue b/src/modals/SetlistSet.vue
@@ -132,7 +132,7 @@
 											<input v-model="setlistSongs" :value="key" type="checkbox">
 											<i class="form-icon"></i> {{ fsong.title }} <label class="label px-2">{{ fsong.tuning }}</label>
 											<div class="text-gray text-small">
-												{{ fsong.subtitle }} | <span :title="$t('title.lastPerformed')">{{ performedSongs[key] }}</span>
+												{{ fsong.subtitle }} <span v-if="performedSongs[key]" class="text-dark" :title="$t('title.lastPerformed')">&nbsp;{{ performedSongs[key] }}</span>
 											</div>
 										</label>
 									</div>

diff --git a/src/views/SongShow.vue b/src/views/SongShow.vue
@@ -315,8 +315,8 @@ export default {
 	mounted () {
 		// focus component area for shortcuts
 		this.$refs['song-show'].focus();
-		// set custom tuning when loading this component without refresh
-		this.tuning = this.song ? this.urlKeyDiff() : 0;
+		// set custom tuning when loading this component and songKey is given
+		this.tuning = this.song && this.songKey ? this.urlKeyDiff() : 0;
 	},
 	methods: {
 		// calculates difference between song key and url key parameter and returns new key scale index