mirror of
				https://github.com/advplyr/audiobookshelf.git
				synced 2025-10-27 11:18:14 +01:00 
			
		
		
		
	Revert "feat: Add a Show Subtitles option"
This reverts commit 3ef189ed4a.
			
			
This commit is contained in:
		
							parent
							
								
									090c02079d
								
							
						
					
					
						commit
						e06ab594e1
					
				| @ -68,8 +68,6 @@ | |||||||
| 
 | 
 | ||||||
|         <div class="flex-grow hidden sm:inline-block" /> |         <div class="flex-grow hidden sm:inline-block" /> | ||||||
| 
 | 
 | ||||||
|         <ui-checkbox v-if="isLibraryPage && !isBatchSelecting" v-model="settings.showSubtitles" :label="$strings.LabelShowSubtitles" checkbox-bg="bg" check-color="white" small class="mr-6" @input="updateShowSubtitles" /> |  | ||||||
| 
 |  | ||||||
|         <!-- collapse series checkbox --> |         <!-- collapse series checkbox --> | ||||||
|         <ui-checkbox v-if="isLibraryPage && isBookLibrary && !isBatchSelecting" v-model="settings.collapseSeries" :label="$strings.LabelCollapseSeries" checkbox-bg="bg" check-color="white" small class="mr-2" @input="updateCollapseSeries" /> |         <ui-checkbox v-if="isLibraryPage && isBookLibrary && !isBatchSelecting" v-model="settings.collapseSeries" :label="$strings.LabelCollapseSeries" checkbox-bg="bg" check-color="white" small class="mr-2" @input="updateCollapseSeries" /> | ||||||
| 
 | 
 | ||||||
| @ -90,17 +88,11 @@ | |||||||
| 
 | 
 | ||||||
|         <ui-context-menu-dropdown v-if="contextMenuItems.length" :items="contextMenuItems" :menu-width="110" class="ml-2" @action="contextMenuAction" /> |         <ui-context-menu-dropdown v-if="contextMenuItems.length" :items="contextMenuItems" :menu-width="110" class="ml-2" @action="contextMenuAction" /> | ||||||
|       </template> |       </template> | ||||||
|       <!-- home page --> |  | ||||||
|       <template v-else-if="isHome"> |  | ||||||
|         <div class="flex-grow" /> |  | ||||||
|         <ui-checkbox v-model="settings.showSubtitles" :label="$strings.LabelShowSubtitles" checkbox-bg="bg" check-color="white" small class="mr-6" @input="updateShowSubtitles" /> |  | ||||||
|       </template> |  | ||||||
|       <!-- search page --> |       <!-- search page --> | ||||||
|       <template v-else-if="page === 'search'"> |       <template v-else-if="page === 'search'"> | ||||||
|         <div class="flex-grow" /> |         <div class="flex-grow" /> | ||||||
|         <p>{{ $strings.MessageSearchResultsFor }} "{{ searchQuery }}"</p> |         <p>{{ $strings.MessageSearchResultsFor }} "{{ searchQuery }}"</p> | ||||||
|         <div class="flex-grow" /> |         <div class="flex-grow" /> | ||||||
|         <ui-checkbox v-model="settings.showSubtitles" :label="$strings.LabelShowSubtitles" checkbox-bg="bg" check-color="white" small class="mr-6" @input="updateShowSubtitles" /> |  | ||||||
|       </template> |       </template> | ||||||
|       <!-- authors page --> |       <!-- authors page --> | ||||||
|       <template v-else-if="page === 'authors'"> |       <template v-else-if="page === 'authors'"> | ||||||
| @ -490,9 +482,6 @@ export default { | |||||||
|     updateCollapseBookSeries() { |     updateCollapseBookSeries() { | ||||||
|       this.saveSettings() |       this.saveSettings() | ||||||
|     }, |     }, | ||||||
|     updateShowSubtitles() { |  | ||||||
|       this.saveSettings() |  | ||||||
|     }, |  | ||||||
|     updateAuthorSort() { |     updateAuthorSort() { | ||||||
|       this.saveSettings() |       this.saveSettings() | ||||||
|     }, |     }, | ||||||
|  | |||||||
| @ -120,9 +120,6 @@ export default { | |||||||
|     filterBy() { |     filterBy() { | ||||||
|       return this.$store.getters['user/getUserSetting']('filterBy') |       return this.$store.getters['user/getUserSetting']('filterBy') | ||||||
|     }, |     }, | ||||||
|     showSubtitles() { |  | ||||||
|       return this.$store.getters['user/getUserSetting']('showSubtitles') |  | ||||||
|     }, |  | ||||||
|     collapseSeries() { |     collapseSeries() { | ||||||
|       return this.$store.getters['user/getUserSetting']('collapseSeries') |       return this.$store.getters['user/getUserSetting']('collapseSeries') | ||||||
|     }, |     }, | ||||||
|  | |||||||
| @ -127,9 +127,6 @@ | |||||||
|           <widgets-explicit-indicator cy-id="explicitIndicator" v-if="isExplicit" /> |           <widgets-explicit-indicator cy-id="explicitIndicator" v-if="isExplicit" /> | ||||||
|         </ui-tooltip> |         </ui-tooltip> | ||||||
|       </div> |       </div> | ||||||
|       <ui-tooltip v-if="showSubtitles" :text="displayLineOne" :disabled="!displayLineOneTruncated" direction="bottom" :delayOnShow="500" class="flex items-center"> |  | ||||||
|         <p class="truncate" ref="displayLineOne" :style="{ fontSize: 0.6 + 'em' }">{{ displayLineOne }}</p> |  | ||||||
|       </ui-tooltip> |  | ||||||
|       <p cy-id="line2" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displayLineTwo || ' ' }}</p> |       <p cy-id="line2" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displayLineTwo || ' ' }}</p> | ||||||
|       <p cy-id="line3" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p> |       <p cy-id="line3" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p> | ||||||
|     </div> |     </div> | ||||||
| @ -169,7 +166,6 @@ export default { | |||||||
|       selected: false, |       selected: false, | ||||||
|       isSelectionMode: false, |       isSelectionMode: false, | ||||||
|       displayTitleTruncated: false, |       displayTitleTruncated: false, | ||||||
|       displayLineOneTruncated: false, |  | ||||||
|       showCoverBg: false |       showCoverBg: false | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
| @ -338,13 +334,6 @@ export default { | |||||||
|       if (this.collapsedSeries) return ignorePrefix ? this.collapsedSeries.nameIgnorePrefix : this.collapsedSeries.name |       if (this.collapsedSeries) return ignorePrefix ? this.collapsedSeries.nameIgnorePrefix : this.collapsedSeries.name | ||||||
|       return ignorePrefix ? this.mediaMetadata.titleIgnorePrefix : this.title || '\u00A0' |       return ignorePrefix ? this.mediaMetadata.titleIgnorePrefix : this.title || '\u00A0' | ||||||
|     }, |     }, | ||||||
|     displayLineOne() { |  | ||||||
|       if (this.collapsedSeries) return this.collapsedSeries.numBooks === 1 ? '1 book' : `${this.collapsedSeries.numBooks} books` |  | ||||||
|       if (this.mediaMetadata.subtitle) return this.mediaMetadata.subtitle |  | ||||||
|       if (this.mediaMetadata.seriesName) return this.mediaMetadata.seriesName |  | ||||||
|       if (this.mediaMetadata.genres) return this.mediaMetadata.genres.filter((genre) => !['Podcasts', 'Audiobook'].includes(genre)).join(', ') || '\u00A0' |  | ||||||
|       return '\u00A0' |  | ||||||
|     }, |  | ||||||
|     displayLineTwo() { |     displayLineTwo() { | ||||||
|       if (this.recentEpisode) return this.title |       if (this.recentEpisode) return this.title | ||||||
|       if (this.isPodcast) return this.author |       if (this.isPodcast) return this.author | ||||||
| @ -638,9 +627,6 @@ export default { | |||||||
|     rssFeed() { |     rssFeed() { | ||||||
|       if (this.booksInSeries) return null |       if (this.booksInSeries) return null | ||||||
|       return this._libraryItem.rssFeed || null |       return this._libraryItem.rssFeed || null | ||||||
|     }, |  | ||||||
|     showSubtitles() { |  | ||||||
|       return this.store.getters['user/getUserSetting']('showSubtitles') |  | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   methods: { |   methods: { | ||||||
| @ -682,9 +668,6 @@ export default { | |||||||
|         if (this.$refs.displayTitle) { |         if (this.$refs.displayTitle) { | ||||||
|           this.displayTitleTruncated = this.$refs.displayTitle.scrollWidth > this.$refs.displayTitle.clientWidth |           this.displayTitleTruncated = this.$refs.displayTitle.scrollWidth > this.$refs.displayTitle.clientWidth | ||||||
|         } |         } | ||||||
|         if (this.$refs.displayLineOne) { |  | ||||||
|           this.displayLineOneTruncated = this.$refs.displayLineOne.scrollWidth > this.$refs.displayLineOne.clientWidth |  | ||||||
|         } |  | ||||||
|       }) |       }) | ||||||
|     }, |     }, | ||||||
|     clickCard(e) { |     clickCard(e) { | ||||||
|  | |||||||
| @ -8,7 +8,6 @@ export const state = () => ({ | |||||||
|     bookshelfCoverSize: 120, |     bookshelfCoverSize: 120, | ||||||
|     collapseSeries: false, |     collapseSeries: false, | ||||||
|     collapseBookSeries: false, |     collapseBookSeries: false, | ||||||
|     showSubtitles: false, |  | ||||||
|     useChapterTrack: false, |     useChapterTrack: false, | ||||||
|     seriesSortBy: 'name', |     seriesSortBy: 'name', | ||||||
|     seriesSortDesc: false, |     seriesSortDesc: false, | ||||||
|  | |||||||
| @ -502,7 +502,6 @@ | |||||||
|   "LabelSettingsTimeFormat": "Time Format", |   "LabelSettingsTimeFormat": "Time Format", | ||||||
|   "LabelShowAll": "Show All", |   "LabelShowAll": "Show All", | ||||||
|   "LabelShowSeconds": "Show seconds", |   "LabelShowSeconds": "Show seconds", | ||||||
|   "LabelShowSubtitles": "Show Subtitles", |  | ||||||
|   "LabelSize": "Size", |   "LabelSize": "Size", | ||||||
|   "LabelSleepTimer": "Sleep timer", |   "LabelSleepTimer": "Sleep timer", | ||||||
|   "LabelSlug": "Slug", |   "LabelSlug": "Slug", | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user