diff --git a/client/components/modals/rssfeed/OpenCloseModal.vue b/client/components/modals/rssfeed/OpenCloseModal.vue
index 8816d634d..6d587489f 100644
--- a/client/components/modals/rssfeed/OpenCloseModal.vue
+++ b/client/components/modals/rssfeed/OpenCloseModal.vue
@@ -10,9 +10,7 @@
@@ -75,8 +73,7 @@ export default {
reverseOrder: false,
ownerName: '',
ownerEmail: ''
- },
- copiedToClipboard: false
+ }
}
},
watch: {
@@ -168,12 +165,6 @@ export default {
this.processing = false
})
},
- async copyToClipboard(str) {
- this.copiedToClipboard = await this.$copyToClipboard(str)
- setTimeout(() => {
- this.copiedToClipboard = false
- }, 2000)
- },
closeFeed() {
this.processing = true
this.$axios
diff --git a/client/components/modals/rssfeed/ViewFeedModal.vue b/client/components/modals/rssfeed/ViewFeedModal.vue
index 4193a0019..ca7a84f31 100644
--- a/client/components/modals/rssfeed/ViewFeedModal.vue
+++ b/client/components/modals/rssfeed/ViewFeedModal.vue
@@ -5,8 +5,7 @@
{{ $strings.HeaderRSSFeedGeneral }}
-
- {{ copiedToClipboard ? 'check' : 'content_copy' }}
+
@@ -62,8 +61,7 @@ export default {
},
data() {
return {
- processing: false,
- copiedToClipboard: false
+ processing: false
}
},
computed: {
@@ -81,16 +79,7 @@ export default {
feedUrl() {
return this.feed ? `${window.origin}${this.$config.routerBasePath}${this.feed.feedUrl}` : ''
}
- },
- methods: {
- async copyToClipboard(str) {
- this.copiedToClipboard = await this.$copyToClipboard(str)
- setTimeout(() => {
- this.copiedToClipboard = false
- }, 2000)
- }
- },
- mounted() {}
+ }
}
diff --git a/client/components/ui/TextInput.vue b/client/components/ui/TextInput.vue
index aaccd1184..6e6218707 100644
--- a/client/components/ui/TextInput.vue
+++ b/client/components/ui/TextInput.vue
@@ -7,8 +7,8 @@
{{ !showPassword ? 'visibility' : 'visibility_off' }}
-
-
{{ !hasCopied ? 'content_copy' : 'done' }}
+
+ {{ !hasCopied ? 'content_copy' : 'done' }}
@@ -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/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 @@