mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-07-09 03:04:54 -04:00
Merge branch 'mealie-next' into fix/bump-sqlalchemy
This commit is contained in:
commit
5db7a735d7
@ -25,6 +25,7 @@
|
||||
:label="$t('shopping-list.note')"
|
||||
rows="1"
|
||||
auto-grow
|
||||
@keypress="handleNoteKeyPress"
|
||||
></v-textarea>
|
||||
</div>
|
||||
<div class="d-flex align-end" style="gap: 20px">
|
||||
@ -142,5 +143,14 @@ export default defineComponent({
|
||||
listItem,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
handleNoteKeyPress(event) {
|
||||
// Save on Enter
|
||||
if (!event.shiftKey && event.key === "Enter") {
|
||||
event.preventDefault();
|
||||
this.$emit("save");
|
||||
}
|
||||
},
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
@ -665,6 +665,11 @@ export default defineComponent({
|
||||
return;
|
||||
}
|
||||
|
||||
if (!createListItemData.value.foodId && !createListItemData.value.note) {
|
||||
// don't create an empty item
|
||||
return;
|
||||
}
|
||||
|
||||
loadingCounter.value += 1;
|
||||
|
||||
// make sure it's inserted into the end of the list, which may have been updated
|
||||
@ -676,7 +681,6 @@ export default defineComponent({
|
||||
|
||||
if (data) {
|
||||
createListItemData.value = listItemFactory(createListItemData.value.isFood || false);
|
||||
createEditorOpen.value = false;
|
||||
refresh();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user