Revert "Refactor: replace default slots"

This reverts commit f1e308074bc33e6762431f90f335ed849776f4d9.

  Let's take this one at a time...
This commit is contained in:
Raphael Beer 2020-03-12 19:51:42 +01:00
parent c3cf682fdf
commit 5626cb2771
No known key found for this signature in database
GPG Key ID: C1AC5E018B25EF11
12 changed files with 35 additions and 34 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<ds-form v-model="form" @submit="handleSubmit" class="comment-form"> <ds-form v-model="form" @submit="handleSubmit" class="comment-form">
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<base-card> <base-card>
<hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" /> <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
<div class="buttons"> <div class="buttons">

View File

@ -1,6 +1,6 @@
<template> <template>
<dropdown class="content-menu" :placement="placement" offset="5"> <dropdown class="content-menu" :placement="placement" offset="5">
<template v-slot="{ toggleMenu }"> <template slot="default" slot-scope="{ toggleMenu }">
<slot name="button" :toggleMenu="toggleMenu"> <slot name="button" :toggleMenu="toggleMenu">
<base-button <base-button
data-test="content-menu-button" data-test="content-menu-button"

View File

@ -6,7 +6,7 @@
:schema="formSchema" :schema="formSchema"
@submit="submit" @submit="submit"
> >
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<base-card> <base-card>
<template #heroImage> <template #heroImage>
<img <img

View File

@ -1,18 +1,18 @@
<template> <template>
<dropdown offset="8"> <dropdown offset="8">
<template v-slot="{ toggleMenu }"> <a
<a :v-model="selected"
:v-model="selected" slot="default"
name="dropdown" slot-scope="{ toggleMenu }"
class="dropdown-filter" name="dropdown"
href="#" class="dropdown-filter"
@click.prevent="toggleMenu()" href="#"
> @click.prevent="toggleMenu()"
<base-icon name="filter" /> >
<label class="label" for="dropdown">{{ selected }}</label> <base-icon name="filter" />
<base-icon class="dropdown-arrow" name="angle-down" /> <label class="label" for="dropdown">{{ selected }}</label>
</a> <base-icon class="dropdown-arrow" name="angle-down" />
</template> </a>
<ds-menu <ds-menu
#popover="{ toggleMenu }" #popover="{ toggleMenu }"
class="dropdown-menu-popover" class="dropdown-menu-popover"

View File

@ -1,10 +1,11 @@
<template> <template>
<dropdown ref="menu" :placement="placement" :offset="offset"> <dropdown ref="menu" :placement="placement" :offset="offset">
<base-button <base-button
v-slot="{ toggleMenu }" slot="default"
icon="filter" icon="filter"
:filled="filterActive" :filled="filterActive"
:ghost="!filterActive" :ghost="!filterActive"
slot-scope="{ toggleMenu }"
@click.prevent="toggleMenu()" @click.prevent="toggleMenu()"
> >
<base-icon class="dropdown-arrow" name="angle-down" /> <base-icon class="dropdown-arrow" name="angle-down" />

View File

@ -1,17 +1,17 @@
<template> <template>
<client-only> <client-only>
<dropdown ref="menu" :placement="placement" :offset="offset"> <dropdown ref="menu" :placement="placement" :offset="offset">
<template v-slot="{ toggleMenu }"> <a
<a slot="default"
class="locale-menu" slot-scope="{ toggleMenu }"
href="#" class="locale-menu"
@click.prevent="toggleMenu()" href="#"
> @click.prevent="toggleMenu()"
<base-icon name="globe" /> >
<span class="label">{{ current.code.toUpperCase() }}</span> <base-icon name="globe" />
<base-icon class="dropdown-arrow" name="angle-down" /> <span class="label">{{ current.code.toUpperCase() }}</span>
</a> <base-icon class="dropdown-arrow" name="angle-down" />
</template> </a>
<ds-menu <ds-menu
#popover="{ toggleMenu }" #popover="{ toggleMenu }"
class="locale-menu-popover" class="locale-menu-popover"

View File

@ -7,7 +7,7 @@
<base-button icon="bell" ghost circle /> <base-button icon="bell" ghost circle />
</nuxt-link> </nuxt-link>
<dropdown v-else class="notifications-menu" offset="8" :placement="placement"> <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
<template v-slot="{ toggleMenu }"> <template slot="default" slot-scope="{ toggleMenu }">
<base-button @click="toggleMenu" ghost circle> <base-button @click="toggleMenu" ghost circle>
<counter-icon icon="bell" :count="unreadNotificationsCount" danger /> <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
</base-button> </base-button>

View File

@ -1,6 +1,6 @@
<template> <template>
<ds-form v-model="formData" :schema="formSchema" @submit="handleSubmit"> <ds-form v-model="formData" :schema="formSchema" @submit="handleSubmit">
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<ds-input <ds-input
id="oldPassword" id="oldPassword"
model="oldPassword" model="oldPassword"

View File

@ -7,7 +7,7 @@
@submit="handleSubmitPassword" @submit="handleSubmitPassword"
class="change-password" class="change-password"
> >
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<ds-input <ds-input
id="password" id="password"
model="password" model="password"

View File

@ -1,6 +1,6 @@
<template> <template>
<ds-form v-model="form" :schema="formSchema" @submit="submit"> <ds-form v-model="form" :schema="formSchema" @submit="submit">
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<base-card> <base-card>
<h2 class="title">{{ $t('settings.data.name') }}</h2> <h2 class="title">{{ $t('settings.data.name') }}</h2>
<ds-input <ds-input

View File

@ -1,6 +1,6 @@
<template> <template>
<ds-form v-model="form" :schema="formSchema" @submit="submit"> <ds-form v-model="form" :schema="formSchema" @submit="submit">
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<base-card> <base-card>
<h2 class="title">{{ $t('settings.email.name') }}</h2> <h2 class="title">{{ $t('settings.email.name') }}</h2>
<ds-input <ds-input

View File

@ -6,7 +6,7 @@
<ds-text v-html="submitMessage" /> <ds-text v-html="submitMessage" />
</base-card> </base-card>
<ds-form v-else v-model="form" :schema="formSchema" @submit="submit"> <ds-form v-else v-model="form" :schema="formSchema" @submit="submit">
<template v-slot="{ errors }"> <template slot-scope="{ errors }">
<base-card> <base-card>
<h2 class="title">{{ $t('settings.email.name') }}</h2> <h2 class="title">{{ $t('settings.email.name') }}</h2>
<ds-input <ds-input