mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/custom_filters

Browse Source
This commit is contained in:
vabene1111
2022-02-18 17:25:15 +01:00
committed by GitHub
parent 2b5aec5d0a d28cf681a3
commit d6fa02cc9e
7 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vue/src/apps/RecipeEditView/RecipeEditView.vue
View File

@@ -656,8 +656,8 @@ export default {
},
warnPageLeave: function (event) {
if (this.recipe_changed) {
event.returnValue = ""
return ""
event.returnValue = "this_string_cant_be_empty_because_of_firefox"
return "this_string_cant_be_empty_because_of_firefox"
}
},
loadRecipe: function () {
@@ -672,8 +672,8 @@ export default {
// set default visibility style for each component of the step
this.recipe.steps.forEach((s) => {
this.$set(s, "time_visible", s.time !== 0)
this.$set(s, "ingredients_visible", s.ingredients.length > 0)
this.$set(s, "instruction_visible", s.instruction !== "")
this.$set(s, "ingredients_visible", s.ingredients.length > 0 || this.recipe.steps.length === 1)
this.$set(s, "instruction_visible", s.instruction !== "" || this.recipe.steps.length === 1)
this.$set(s, "step_recipe_visible", s.step_recipe !== null)
this.$set(s, "file_visible", s.file !== null)
})

7
vue/src/components/StepComponent.vue
View File

@@ -32,15 +32,16 @@
<div class="row">
<!-- ingredients table -->
<div class="col col-md-4" v-if="step.ingredients.length > 0 && (recipe.steps.length > 1 || force_ingredients)">
<table class="table table-sm" >
<div class="col col-md-4"
v-if="step.ingredients.length > 0 && (recipe.steps.length > 1 || force_ingredients)">
<table class="table table-sm">
<ingredients-card :steps="[step]" :ingredient_factor="ingredient_factor"
@checked-state-changed="$emit('checked-state-changed', $event)"/>
</table>
</div>
<div class="col"
:class="{ 'col-md-8': recipe.steps.length > 1, 'col-md-12': recipe.steps.length <= 1 }">
:class="{ 'col-md-8 col-12': recipe.steps.length > 1, 'col-md-12 col-12': recipe.steps.length <= 1 }">
<!-- step text -->
<div class="row">
<div class="col col-md-12">