Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adjust to changed counter bubble behavior #2753

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −37
Draft

fix: adjust to changed counter bubble behavior #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions src/components/AppNavigation/ListItemCalendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</NcActions>
<NcAvatar v-if="calendar.isSharedWithMe && loadedOwnerPrincipal" :user="ownerUserId" :display-name="ownerDisplayname" />
<div v-if="calendar.isSharedWithMe && !loadedOwnerPrincipal" class="icon icon-loading" />
<NcCounterBubble v-if="calendarCount">
{{ counterFormatter(calendarCount) }}
</NcCounterBubble>
<NcCounterBubble v-if="calendarCount" :count="calendarCount" />
</template>

<template v-if="!deleteTimeout" #actions>
Expand Down Expand Up @@ -298,21 +296,6 @@ export default {
'moveTask',
]),

/**
* Format the task counter
*
* @param {number} count The number of tasks
*/
counterFormatter(count) {
switch (false) {
case count !== 0:
return ''
case count < 999:
return '999+'
default:
return count
}
},
/**
* Handle the drag over
*
Expand Down
20 changes: 1 addition & 19 deletions src/views/AppNavigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
:size="20" />
</template>
<template #counter>
<NcCounterBubble v-show="collectionCount(collection.id)">
{{ counterFormatter(collectionCount(collection.id)) }}
</NcCounterBubble>
<NcCounterBubble v-show="collectionCount(collection.id)" :count="collectionCount(collection.id)" />
</template>
</NcAppNavigationItem>
<Sortable class="draggable-container"
Expand Down Expand Up @@ -186,22 +184,6 @@ export default {
'setCalendarOrder',
]),

/**
* Format the task counter
*
* @param {number} count The number of tasks
*/
counterFormatter(count) {
switch (false) {
case count !== 0:
return ''
case count < 999:
return '999+'
default:
return count
}
},

/**
* Indicate that we drag a calendar item
*
Expand Down
Loading