From 1410cba8fa1e8998f4e66e3e9ecdba724982da87 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Fri, 17 Jan 2020 19:45:44 +0100 Subject: [PATCH 01/22] switch to table layout as default --- src/js/views/Vote.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue index 023f9fc4e..824c29893 100644 --- a/src/js/views/Vote.vue +++ b/src/js/views/Vote.vue @@ -88,7 +88,7 @@ export default { isLoading: false, initialTab: 'comments', newName: '', - tableMode: false + tableMode: true } }, From edf402ee34998d4e6e3b013edd1be67aacb98ff2 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Fri, 17 Jan 2020 20:00:51 +0100 Subject: [PATCH 02/22] Workaround firstDayOfWeek in DateTimePicker --- .../SideBar/SideBarTabConfiguration.vue | 25 ++++++++----------- .../SideBar/SideBarTabDateOptions.vue | 13 ++++++++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/js/components/SideBar/SideBarTabConfiguration.vue b/src/js/components/SideBar/SideBarTabConfiguration.vue index 29410328a..31ba95a09 100644 --- a/src/js/components/SideBar/SideBarTabConfiguration.vue +++ b/src/js/components/SideBar/SideBarTabConfiguration.vue @@ -101,6 +101,15 @@ export default { acl: state => state.acl }), + firstDOW() { + // vue2-datepicker needs 7 for sunday + if (moment.localeData()._week.dow === 0) { + return 7 + } else { + return moment.localeData()._week.dow + } + }, + // Add bindings pollDescription: { get() { @@ -183,18 +192,6 @@ export default { } }, - langPicker() { - return { - formatLocale: { - months: moment.months(), - monthsShort: moment.monthsShort(), - weekdays: moment.weekdays(), - weekdaysMin: moment.weekdaysMin(), - firstDayOfWeek: moment.localeData()._week.dow - } - } - }, - expirationDatePicker() { return { editable: true, @@ -204,12 +201,12 @@ export default { // TODO: use this for version 2.x lang: OC.getLanguage().split('-')[0], - firstDayOfWeek: moment.localeData()._week.dow, + firstDayOfWeek: this.firstDOW, // TODO: use this from version 3.x on // lang: { // formatLocale: { - // firstDayOfWeek: moment.localeData()._week.dow, + // firstDayOfWeek: this.firstDOW, // months: moment.months(), // monthsShort: moment.monthsShort(), // weekdays: moment.weekdays(), diff --git a/src/js/components/SideBar/SideBarTabDateOptions.vue b/src/js/components/SideBar/SideBarTabDateOptions.vue index 7fb911253..e00c7f59d 100644 --- a/src/js/components/SideBar/SideBarTabDateOptions.vue +++ b/src/js/components/SideBar/SideBarTabDateOptions.vue @@ -93,6 +93,15 @@ export default { ...mapGetters(['sortedOptions']), + firstDOW() { + // vue2-datepicker needs 7 for sunday + if (moment.localeData()._week.dow === 0) { + return 7 + } else { + return moment.localeData()._week.dow + } + }, + optionDatePicker() { return { editable: false, @@ -102,12 +111,12 @@ export default { // TODO: use this for version 2.x lang: OC.getLanguage().split('-')[0], - firstDayOfWeek: moment.localeData()._week.dow, + firstDayOfWeek: this.firstDOW, // TODO: use this from version 3.x on // lang: { // formatLocale: { - // firstDayOfWeek: moment.localeData()._week.dow, + // firstDayOfWeek: this.firstDOW, // months: moment.months(), // monthsShort: moment.monthsShort(), // weekdays: moment.weekdays(), From 16bcc1ffe33b0a93a48269170645a83a29a9b882 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Fri, 17 Jan 2020 20:25:01 +0100 Subject: [PATCH 03/22] Avoid useless directives --- src/js/components/Base/PollInformation.vue | 5 +++++ src/js/components/PollList/PollListItem.vue | 8 +++++++- src/js/components/SideBar/SideBarTabConfiguration.vue | 7 ++++++- src/js/components/SideBar/SideBarTabDateOptions.vue | 7 ++++--- src/js/main.js | 7 +------ src/js/views/PublicVote.vue | 2 ++ src/js/views/Vote.vue | 2 ++ 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/js/components/Base/PollInformation.vue b/src/js/components/Base/PollInformation.vue index b20bac282..8d2e831dd 100644 --- a/src/js/components/Base/PollInformation.vue +++ b/src/js/components/Base/PollInformation.vue @@ -33,10 +33,15 @@