groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-12-22 19:59:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'advplyr:master' into audible-confidence-score

Browse source
This commit is contained in:
mikiher 2025-06-16 10:26:58 +03:00 • committed by GitHub
commit 5017e7ce9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
54 changed files with 1639 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/components/controls/LibraryFilterSelect.vue
View file

@ -276,6 +276,11 @@ export default {
text: this.$strings.ButtonIssues,
value: 'issues',
sublist: false
},
{
text: this.$strings.LabelRSSFeedOpen,
value: 'feed-open',
sublist: false
}
]
},

6
client/components/ui/VueTrix.vue
View file

@ -31,7 +31,7 @@
</div>
</div>
</trix-toolbar>
<trix-editor :toolbar="toolbarId" :contenteditable="!disabledEditor" :class="['trix-content']" ref="trix" :input="computedId" :placeholder="placeholder" @trix-change="handleContentChange" @trix-initialize="handleInitialize" @trix-focus="processTrixFocus" @trix-blur="processTrixBlur" />
<trix-editor :toolbar="toolbarId" :contenteditable="!disabledEditor" :class="['trix-content']" ref="trix" :input="computedId" :placeholder="placeholder" @trix-change="handleContentChange" @trix-initialize="handleInitialize" @trix-focus="processTrixFocus" @trix-blur="processTrixBlur" @trix-attachment-add="handleAttachmentAdd" />
<input type="hidden" :name="inputName" :id="computedId" :value="editorContent" />
</div>
</template>
@ -316,6 +316,10 @@ export default {
if (this.$refs.trix && this.$refs.trix.blur) {
this.$refs.trix.blur()
}
},
handleAttachmentAdd(event) {
// Prevent pasting in images/any files from the browser
event.attachment.remove()
}
},
mounted() {

18
client/components/widgets/EncoderOptionsCard.vue
View file

@ -143,10 +143,18 @@ export default {
localStorage.setItem('embedMetadataCodec', val)
},
getEncodingOptions() {
return {
codec: this.selectedCodec || 'aac',
bitrate: this.selectedBitrate || '128k',
channels: this.selectedChannels || 2
if (this.showAdvancedView) {
return {
codec: this.customCodec || this.selectedCodec || 'aac',
bitrate: this.customBitrate || this.selectedBitrate || '128k',
channels: this.customChannels || this.selectedChannels || 2
}
} else {
return {
codec: this.selectedCodec || 'aac',
bitrate: this.selectedBitrate || '128k',
channels: this.selectedChannels || 2
}
}
},
setPreset() {
@ -162,7 +170,7 @@ export default {
} else {
// Find closest bitrate rounding up
const bitratesToMatch = [32, 64, 128, 192]
const closestBitrate = bitratesToMatch.find((bitrate) => bitrate >= this.currentBitrate)
const closestBitrate = bitratesToMatch.find((bitrate) => bitrate >= this.currentBitrate) || 192
this.selectedBitrate = closestBitrate + 'k'
}

2
client/components/widgets/LoadingSpinner.vue
View file

@ -248,4 +248,4 @@ export default {
transform: scale(0);
}
}
</style>
</style>

2
client/components/widgets/SeriesInputWidget.vue
View file

@ -109,4 +109,4 @@ export default {
}
}
}
</script>
</script>