diff --git a/client/assets/app.css b/client/assets/app.css index 7daf74ff4..0cd4ac492 100644 --- a/client/assets/app.css +++ b/client/assets/app.css @@ -5,7 +5,7 @@ @import './absicons.css'; :root { - --bookshelf-texture-img: url(/textures/wood_default.jpg); + --bookshelf-texture-img: url(~static/textures/wood_default.jpg); --bookshelf-divider-bg: linear-gradient(180deg, rgba(149, 119, 90, 1) 0%, rgba(103, 70, 37, 1) 17%, rgba(103, 70, 37, 1) 88%, rgba(71, 48, 25, 1) 100%); } @@ -247,4 +247,4 @@ Bookshelf Label .abs-btn:disabled::before { background-color: rgba(0, 0, 0, 0.2); -} \ No newline at end of file +} diff --git a/client/components/modals/AudioFileDataModal.vue b/client/components/modals/AudioFileDataModal.vue index 7e33a9805..eb70f1c3f 100644 --- a/client/components/modals/AudioFileDataModal.vue +++ b/client/components/modals/AudioFileDataModal.vue @@ -90,8 +90,8 @@
-
@@ -113,14 +113,13 @@ export default { return { probingFile: false, ffprobeData: null, - copiedToClipboard: false + hasCopied: null } }, watch: { show(newVal) { if (newVal) { this.ffprobeData = null - this.copiedToClipboard = false this.probingFile = false } } @@ -165,8 +164,13 @@ export default { this.probingFile = false }) }, - async copyFfprobeData() { - this.copiedToClipboard = await this.$copyToClipboard(this.prettyFfprobeData) + copyToClipboard() { + clearTimeout(this.hasCopied) + this.$copyToClipboard(this.prettyFfprobeData).then((success) => { + this.hasCopied = setTimeout(() => { + this.hasCopied = null + }, 2000) + }) } }, mounted() {} diff --git a/client/components/modals/ShareModal.vue b/client/components/modals/ShareModal.vue index 5b3798847..0ae65ec67 100644 --- a/client/components/modals/ShareModal.vue +++ b/client/components/modals/ShareModal.vue @@ -16,7 +16,7 @@ @@ -47,7 +47,7 @@ export default { showPassword: false, isHovering: false, isFocused: false, - hasCopied: false, + hasCopied: null, isInvalidDate: false } }, @@ -62,7 +62,12 @@ export default { }, classList() { var _list = [] - _list.push(`px-${this.paddingX}`) + if (this.showCopy) { + _list.push('pl-3', 'pr-8') + } else { + _list.push(`px-${this.paddingX}`) + } + _list.push(`py-${this.paddingY}`) if (this.noSpinner) _list.push('no-spinner') if (this.textCenter) _list.push('text-center') @@ -80,11 +85,10 @@ export default { }, methods: { copyToClipboard() { - if (this.hasCopied) return + clearTimeout(this.hasCopied) this.$copyToClipboard(this.inputValue).then((success) => { - this.hasCopied = success - setTimeout(() => { - this.hasCopied = false + this.hasCopied = setTimeout(() => { + this.hasCopied = null }, 2000) }) }, diff --git a/client/components/ui/TextInputWithLabel.vue b/client/components/ui/TextInputWithLabel.vue index ee9ffb7a9..a10394bdd 100644 --- a/client/components/ui/TextInputWithLabel.vue +++ b/client/components/ui/TextInputWithLabel.vue @@ -6,7 +6,7 @@ {{ note }} - + @@ -23,7 +23,8 @@ export default { }, readonly: Boolean, disabled: Boolean, - inputClass: String + inputClass: String, + showCopy: Boolean }, data() { return {} diff --git a/client/package-lock.json b/client/package-lock.json index f896b9382..cf6ed8629 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "audiobookshelf-client", - "version": "2.18.0", + "version": "2.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "audiobookshelf-client", - "version": "2.18.0", + "version": "2.18.1", "license": "ISC", "dependencies": { "@nuxtjs/axios": "^5.13.6", diff --git a/client/package.json b/client/package.json index 32d408908..ee50f38d5 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf-client", - "version": "2.18.0", + "version": "2.18.1", "buildNumber": 1, "description": "Self-hosted audiobook and podcast client", "main": "index.js", diff --git a/client/pages/batch/index.vue b/client/pages/batch/index.vue index 5cc831764..263dee582 100644 --- a/client/pages/batch/index.vue +++ b/client/pages/batch/index.vue @@ -86,7 +86,12 @@ -
+
+ {{ $strings.ButtonReset }} + + {{ $strings.ButtonBatchEditPopulateFromExisting }} + +
{{ $strings.ButtonApply }}
@@ -97,6 +102,11 @@