commit 0b2a69bea14c8c081f2cf2e27c503b8cef0ff012
parent 4cfc4165a76f878736046bba412b99682354e928
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Tue, 9 Mar 2021 14:41:37 -0800
Fix bug with default filters in filters-page
Diffstat:
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/js/filtersPage.js b/js/filtersPage.js
@@ -20,8 +20,8 @@ let filterInput = Vue.component("filterInput", {
data: function() {
return {
- verbFilters: [{tense:"All Tenses", type:"All Types", subject:"All Subjects", direction:"Eng. → Conj."}],
- vocabFilters: [{category:"All Categories", type:"All Types", direction:"Eng. ↔ Esp."}],
+ verbFilters: [],
+ vocabFilters: [],
};
},
@@ -464,6 +464,11 @@ let filtersPage = Vue.component("filtersPage", {
window.addEventListener("keyup", this.keyup);
},
+ activated: function() {
+ // Add 1 filter by default
+ if (this.filters.length === 0) this.$refs.filters.AddFilter();
+ },
+
destroyed: function() {
// Remove keyup handler
window.removeEventListener("keyup", this.keyup);
@@ -473,7 +478,7 @@ let filtersPage = Vue.component("filtersPage", {
<div class="filtersPage">
<page-header @back="$emit('back');" image="images/arrow-left.svg"></page-header>
<main>
- <filter-input :category="category" v-model="filters"></filter-input>
+ <filter-input ref="filters" :category="category" v-model="filters"></filter-input>
<settings-input v-model="settings"></settings-input>
<button class="settingsStart" @click="StartSession();">Start</button>
</main>
diff --git a/tests/test.filtersPage.js b/tests/test.filtersPage.js
@@ -11,16 +11,12 @@ describe("FilterInput", function() {
expect(FilterInput.category).to.equal("verbs");
});
- it("VerbFilters should be correct", function() {
- expect(FilterInput.verbFilters).to.deep.equal([
- {tense:"All Tenses", type:"All Types", subject:"All Subjects", direction:"Eng. → Conj."}
- ]);
+ it("VerbFilters should be empty", function() {
+ expect(FilterInput.verbFilters).to.deep.equal([]);
});
- it("VocabFilters should be correct", function() {
- expect(FilterInput.vocabFilters).to.deep.equal([
- {category:"All Categories", type:"All Types", direction:"Eng. ↔ Esp."}
- ]);
+ it("VocabFilters should be empty", function() {
+ expect(FilterInput.vocabFilters).to.deep.equal([]);
});
});