Skip to content

Commit b3a36b2

Browse files
Merge pull request #8162 from nextcloud/backport/8161/stable34
[stable34] Fix/date selector names
2 parents 4aac6f1 + 5a6b158 commit b3a36b2

3 files changed

Lines changed: 5 additions & 10 deletions

File tree

src/components/card/CardSidebarTabDetails.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020

2121
<StartDateSelector :card="card"
2222
:can-edit="canEdit"
23-
@change="updateCardStartDate"
2423
@input="debouncedUpdateCardStartDate" />
2524

2625
<DueDateSelector :card="card"
2726
:can-edit="canEdit"
28-
@change="updateCardDue"
2927
@input="debouncedUpdateCardDue" />
3028

3129
<DependentCardsSelector :card="card"
@@ -163,7 +161,7 @@ export default {
163161
164162
debouncedUpdateCardDue: debounce(function(val) {
165163
this.updateCardDue(val)
166-
}, 500),
164+
}, 500, { leading: true }),
167165
168166
updateCardStartDate(val) {
169167
this.$store.dispatch('updateCardStartDate', {
@@ -174,7 +172,7 @@ export default {
174172
175173
debouncedUpdateCardStartDate: debounce(function(val) {
176174
this.updateCardStartDate(val)
177-
}, 500),
175+
}, 500, { leading: true }),
178176
179177
addLabelToCard(newLabel) {
180178
this.copiedCard.labels.push(newLabel)

src/components/card/DueDateSelector.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
:hide-label="true"
1515
type="datetime-local" />
1616
<NcActions v-if="canEdit"
17-
:menu-title="!duedate ? t('deck', 'Add due date') : null"
17+
:menu-name="!duedate ? t('deck', 'Add due date') : null"
1818
type="tertiary"
1919
data-cy-due-date-actions>
2020
<template v-if="!duedate" #icon>
@@ -220,12 +220,10 @@ export default defineComponent({
220220
},
221221
removeDue() {
222222
this.duedate = null
223-
this.$emit('change', null)
224223
225224
},
226225
selectShortcut(shortcut) {
227226
this.duedate = shortcut.timestamp
228-
this.$emit('change', shortcut.timestamp)
229227
},
230228
getTimestamp(momentObject) {
231229
return momentObject?.minute(0).second(0).millisecond(0).toDate() || null

src/components/card/StartDateSelector.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
:hide-label="true"
1414
type="datetime-local" />
1515
<NcActions v-if="canEdit"
16-
:menu-title="!startdate ? t('deck', 'Add start date') : null"
16+
:force-name="!startdate"
1717
type="tertiary">
1818
<template v-if="!startdate" #icon>
1919
<Plus :size="20" />
@@ -24,7 +24,7 @@
2424
<template #icon>
2525
<Plus :size="20" />
2626
</template>
27-
{{ t('deck', 'Choose a date') }}
27+
{{ t('deck', 'Add start date') }}
2828
</NcActionButton>
2929
<NcActionButton v-else
3030
icon="icon-delete"
@@ -99,7 +99,6 @@ export default defineComponent({
9999
},
100100
removeStartDate() {
101101
this.startdate = null
102-
this.$emit('change', null)
103102
},
104103
},
105104
})

0 commit comments

Comments
 (0)