Skip to content

Cleanup some template conditionals #3888

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

Merged
FreeTubeBot merged 1 commit into from
Aug 16, 2023
Merged

Cleanup some template conditionals #3888

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
57 changes: 30 additions & 27 deletions src/renderer/components/download-settings/download-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,38 @@
@change="updateDownloadBehavior"
/>
</ft-flex-box>
<ft-flex-box
<template
v-if="downloadBehavior === 'download'"
class="settingsFlexStart500px"
>
<ft-toggle-switch
:label="$t('Settings.Download Settings.Ask Download Path')"
:default-value="askForDownloadPath"
@change="handleDownloadingSettingChange"
/>
</ft-flex-box>
<ft-flex-box
v-if="!askForDownloadPath && downloadBehavior === 'download'"
>
<ft-input
class="folderDisplay"
:placeholder="downloadPath"
:show-action-button="false"
:show-label="false"
:disabled="true"
/>
</ft-flex-box>
<ft-flex-box
v-if="!askForDownloadPath && downloadBehavior === 'download'"
>
<ft-button
:label="$t('Settings.Download Settings.Choose Path')"
@click="chooseDownloadingFolder"
/>
</ft-flex-box>
<ft-flex-box
class="settingsFlexStart500px"
>
<ft-toggle-switch
:label="$t('Settings.Download Settings.Ask Download Path')"
:default-value="askForDownloadPath"
@change="handleDownloadingSettingChange"
/>
</ft-flex-box>
<template
v-if="!askForDownloadPath"
>
<ft-flex-box>
<ft-input
class="folderDisplay"
:placeholder="downloadPath"
:show-action-button="false"
:show-label="false"
:disabled="true"
/>
</ft-flex-box>
<ft-flex-box>
<ft-button
:label="$t('Settings.Download Settings.Choose Path')"
@click="chooseDownloadingFolder"
/>
</ft-flex-box>
</template>
</template>
</ft-settings-section>
</template>

Expand Down
36 changes: 19 additions & 17 deletions src/renderer/components/ft-profile-edit/ft-profile-edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,25 @@
:label="$t('Profile.Create Profile')"
@click="saveProfile"
/>
<ft-button
v-if="!isNew"
:label="$t('Profile.Update Profile')"
@click="saveProfile"
/>
<ft-button
v-if="!isNew"
:label="$t('Profile.Make Default Profile')"
@click="setDefaultProfile"
/>
<ft-button
v-if="!isMainProfile && !isNew"
:label="$t('Profile.Delete Profile')"
text-color="var(--text-with-main-color)"
background-color="var(--primary-color)"
@click="openDeletePrompt"
/>
<template
v-else
>
<ft-button
:label="$t('Profile.Update Profile')"
@click="saveProfile"
/>
<ft-button
:label="$t('Profile.Make Default Profile')"
@click="setDefaultProfile"
/>
<ft-button
v-if="!isMainProfile"
:label="$t('Profile.Delete Profile')"
text-color="var(--text-with-main-color)"
background-color="var(--primary-color)"
@click="openDeletePrompt"
/>
</template>
</ft-flex-box>
</ft-card>
<ft-prompt
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/proxy-settings/proxy-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@change="handleUpdateProxy"
/>
</ft-flex-box>
<div
<template
v-if="useProxy"
>
<ft-flex-box>
Expand Down Expand Up @@ -72,7 +72,7 @@
{{ $t('Settings.Proxy Settings.City') }}: {{ proxyCity }}
</p>
</div>
</div>
</template>
</ft-settings-section>
</template>

Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/sponsor-block-settings/sponsor-block-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@change="handleUpdateUseDeArrowTitles"
/>
</ft-flex-box>
<div
<template
v-if="useSponsorBlock || useDeArrowTitles"
>
<ft-flex-box
Expand Down Expand Up @@ -46,7 +46,7 @@
:category-name="category"
/>
</ft-flex-box>
</div>
</template>
</ft-settings-section>
</template>

Expand Down
6 changes: 3 additions & 3 deletions src/renderer/views/Subscriptions/Subscriptions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@
role="tabpanel"
/>
<subscriptions-shorts
v-if="currentTab === 'shorts'"
v-else-if="currentTab === 'shorts'"
id="subscriptionsPanel"
role="tabpanel"
/>
<subscriptions-live
v-if="currentTab === 'live'"
v-else-if="currentTab === 'live'"
id="subscriptionsPanel"
role="tabpanel"
/>
<p v-if="currentTab === null">
<p v-else-if="currentTab === null">
{{ $t("Subscriptions.All Subscription Tabs Hidden", {
subsection: $t('Settings.Distraction Free Settings.Sections.Subscriptions Page'),
settingsSection: $t('Settings.Distraction Free Settings.Distraction Free Settings')
Expand Down