Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions src/components/Collections.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<button
@click="() => removeCollection(collection)"
type="button"
:disabled="form.inProgress() ? 'true' : null"
:disabled="form.inProgress()"
>
{{ t('collection.remove') }}
</button>
Expand All @@ -32,7 +32,7 @@
v-if="notSelectedCollections.length > 0"
@submit.prevent="addCollection"
class="flow flow--small"
:disabled="form.inProgress() ? 'true' : null"
:disabled="form.inProgress()"
>
<div v-if="fillMode === 'select'" class="flow flow--smaller">
<div class="cols cols--always cols--center cols--gap-smaller">
Expand All @@ -45,7 +45,7 @@
type="button"
class="button--smaller"
@click="setFillModeToText"
:disabled="form.inProgress() ? 'true' : null"
:disabled="form.inProgress()"
>
<Icon name="pencil" />
{{ t('collection.new') }}
Expand All @@ -57,7 +57,7 @@
v-model="newCollectionId"
id="collection-select"
ref="collection-select"
:disabled="form.inProgress() ? 'true' : null"
:disabled="form.inProgress()"
>
<option v-for="collection in notSelectedCollectionsNoGroup" :value="collection.id">
{{ collection.name }}
Expand Down Expand Up @@ -90,7 +90,7 @@
type="button"
class="button--smaller"
@click="setFillModeToSelect"
:disabled="form.inProgress() ? 'true' : null"
:disabled="form.inProgress()"
>
{{ t('collection.new_cancel') }}
</button>
Expand All @@ -102,12 +102,12 @@
v-model="newCollectionName"
id="collection-name"
ref="collection-name"
:disabled="form.inProgress() ? 'true' : null"
:disabled="form.inProgress()"
>
</div>

<div class="text--center">
<button class="button--primary" :disabled="form.inProgress() ? 'true' : null">
<button class="button--primary" :disabled="form.inProgress()">
{{ t('collection.add') }}
</button>
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/components/Notes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<form
@submit.prevent="addNote"
class="flow flow--small"
:disabled="form.inProgress()"
>
<p v-if="form.isInvalid('@base')" class="form-group__error" role="alert">
{{ t('forms.error') }}
Expand All @@ -65,6 +66,7 @@
ref="note-content"
:aria-invalid="form.isInvalid('content')"
:aria-errormessage="form.isInvalid('content') ? 'note-content-error' : null"
:disabled="form.inProgress()"
></textarea>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/screens/LoginScreen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@

<div class="flow flow--small text--center">
<div>
<button class="button--primary button--big" :disabled="form.inProgress() ? 'true' : null">
<button class="button--primary button--big" :disabled="form.inProgress()">
{{ t("login.submit") }}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/screens/SettingsScreen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</div>

<div class="text--center">
<button class="button--primary button--big" :disabled="form.inProgress() ? 'true' : null">
<button class="button--primary button--big" :disabled="form.inProgress()">
{{ t("settings.submit") }}
</button>
</div>
Expand Down