diff options
author | Raimund Schlüßler <raimund.schluessler@mailbox.org> | 2021-09-29 22:06:50 +0300 |
---|---|---|
committer | Raimund Schlüßler <raimund.schluessler@mailbox.org> | 2021-09-29 22:37:12 +0300 |
commit | 45d5bfcad56beb8bb8855668070fbf1d2a1dbafb (patch) | |
tree | cf4fb03742c9e656080719d84ea66d9d23bb6d6b /src | |
parent | 6811c50519b80051985abe2c9b52e9d1ad7ac8f6 (diff) |
Update nextcloud/vue, cleanup hacks
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/components/AppNavigation/AppNavigationSettings.vue | 7 | ||||
-rw-r--r-- | src/components/AppNavigation/CalendarSharee.vue | 2 | ||||
-rw-r--r-- | src/components/AppNavigation/Trashbin.vue | 5 | ||||
-rw-r--r-- | src/main.js | 6 | ||||
-rw-r--r-- | src/views/AppNavigation.vue | 4 |
5 files changed, 11 insertions, 13 deletions
diff --git a/src/components/AppNavigation/AppNavigationSettings.vue b/src/components/AppNavigation/AppNavigationSettings.vue index be97cb61..76b8a7f3 100644 --- a/src/components/AppNavigation/AppNavigationSettings.vue +++ b/src/components/AppNavigation/AppNavigationSettings.vue @@ -122,10 +122,13 @@ export default { calendars: 'getSortedWritableCalendars', }), }, - methods: - mapActions([ + methods: { + t, + + ...mapActions([ 'setVisibility', ]), + }, } </script> diff --git a/src/components/AppNavigation/CalendarSharee.vue b/src/components/AppNavigation/CalendarSharee.vue index 1a387b3c..807d9102 100644 --- a/src/components/AppNavigation/CalendarSharee.vue +++ b/src/components/AppNavigation/CalendarSharee.vue @@ -108,6 +108,8 @@ export default { }, }, methods: { + t, + async deleteSharee() { if (this.loading) { return false diff --git a/src/components/AppNavigation/Trashbin.vue b/src/components/AppNavigation/Trashbin.vue index 7aecfddb..1acf4ba5 100644 --- a/src/components/AppNavigation/Trashbin.vue +++ b/src/components/AppNavigation/Trashbin.vue @@ -101,7 +101,7 @@ import { uidToHexColor } from '../../utils/color' import logger from '../../utils/logger' import { showError } from '@nextcloud/dialogs' -import { translate as t } from '@nextcloud/l10n' +import { translate as t, translatePlural as n } from '@nextcloud/l10n' import moment from '@nextcloud/moment' import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem' import Actions from '@nextcloud/vue/dist/Components/Actions' @@ -187,6 +187,9 @@ export default { }, }, methods: { + t, + n, + async onShow() { this.showModal = true diff --git a/src/main.js b/src/main.js index c4f1d7aa..8b55e17d 100644 --- a/src/main.js +++ b/src/main.js @@ -97,12 +97,6 @@ if (!OCA.Tasks) { OCA.Tasks = {} } -Vue.prototype.t = function() { - return t.apply(null, arguments).toString() -} -Vue.prototype.n = function() { - return n.apply(null, arguments).toString() -} Vue.prototype.$OC = OC Vue.prototype.$OCA = OCA Vue.prototype.$appVersion = appVersion diff --git a/src/views/AppNavigation.vue b/src/views/AppNavigation.vue index b31aebe5..e656d95a 100644 --- a/src/views/AppNavigation.vue +++ b/src/views/AppNavigation.vue @@ -456,10 +456,6 @@ export default { <style lang="scss" scoped> $color-error: #e9322d; -#app-settings::v-deep #app-settings-header .settings-button { - padding-left: 50px; -} - .collection::v-deep { &.collection--edit { .app-navigation-entry-link { |