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

Use nc-vue ActionCaption component #5303

Merged
merged 2 commits into from
Jun 17, 2021
Merged

Use nc-vue ActionCaption component #5303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d575013
Use nc-vue ActionCaption component
marcoambrosini Mar 3, 2021
fbb10cc
Update tests
marcoambrosini Jun 17, 2021
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
57 changes: 0 additions & 57 deletions src/components/LeftSidebar/ActionCaption/ActionCaption.vue
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/components/LeftSidebar/ConversationsList/Conversation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
</ActionButton>

<ActionSeparator />

<ActionText
<ActionCaption
:title="t('spreed', 'Chat notifications')" />

<ActionButton
:class="{'forced-active': isNotifyAlways}"
icon="icon-sound"
Expand Down Expand Up @@ -109,7 +109,7 @@
import { showError, showSuccess } from '@nextcloud/dialogs'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import ActionSeparator from '@nextcloud/vue/dist/Components/ActionSeparator'
import ActionText from '@nextcloud/vue/dist/Components/ActionText'
import ActionCaption from '@nextcloud/vue/dist/Components/ActionCaption'
import AppContentListItem from './AppContentListItem/AppContentListItem'
import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter'
import ConversationIcon from './../../ConversationIcon'
Expand All @@ -121,7 +121,7 @@ export default {
components: {
ActionButton,
ActionSeparator,
ActionText,
ActionCaption,
AppContentListItem,
AppNavigationCounter,
ConversationIcon,
Expand Down
2 changes: 1 addition & 1 deletion src/components/LeftSidebar/LeftSidebar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ describe('LeftSidebar.vue', () => {
expect(listedEls.at(0).props('item')).toStrictEqual(conversationsList[0])
expect(listedEls.at(1).props('item')).toStrictEqual(conversationsList[1])

const captionsEls = appNavEl.findAllComponents({ name: 'Caption' })
const captionsEls = appNavEl.findAllComponents({ name: 'AppNavigationCaption' })
expect(captionsEls.exists()).toBe(true)
expect(captionsEls.length).toBeGreaterThan(1)
expect(captionsEls.at(0).props('title')).toBe('Conversations')
Expand Down