Commit 49d11882 authored by Marc Mautz's avatar Marc Mautz

added "enabledFilter" & "enabledFilterOptions" options, updated "filterMode" handling

parent 1ac0feb7
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
@filterModeChange="filterModeChange" @filterModeChange="filterModeChange"
:filter-mode="filterMode" :filter-mode="filterMode"
:filter="filterOptions" :filter="filterOptions"
:enabled-filter="settings.enabledFilter"
:enabled-filter-options="settings.enabledFilterOptions"
:enabled-search="settings.enabledSearch" :enabled-search="settings.enabledSearch"
:enabled-sort="settings.enabledSort"> :enabled-sort="settings.enabledSort">
</vue-shuffle-navbar> </vue-shuffle-navbar>
...@@ -52,7 +54,9 @@ ...@@ -52,7 +54,9 @@
} }
}, },
created () {}, created () {},
mounted () {}, mounted () {
// console.log('settings => ', JSON.stringify(this.settings, null, 2))
},
updated () { updated () {
// TODO: check initializing e.g. mounted (lifecycle hooks https://vuejs.org/v2/guide/instance.html#Instance-Lifecycle-Hooks) // TODO: check initializing e.g. mounted (lifecycle hooks https://vuejs.org/v2/guide/instance.html#Instance-Lifecycle-Hooks)
if (!this.shuffle && document.querySelectorAll('.shuffle-item').length) { if (!this.shuffle && document.querySelectorAll('.shuffle-item').length) {
...@@ -134,7 +138,7 @@ ...@@ -134,7 +138,7 @@
easing: 'cubic-bezier(0.165, 0.840, 0.440, 1.000)', // easeOutQuart easing: 'cubic-bezier(0.165, 0.840, 0.440, 1.000)', // easeOutQuart
itemSelector: '.shuffle-item', itemSelector: '.shuffle-item',
sizer: '.sizer-element', sizer: '.sizer-element',
filterMode: Shuffle.FilterMode.ANY filterMode: (this.settings.filterMode === 'and') ? Shuffle.FilterMode.ANY : Shuffle.FilterMode.ALL
}) })
this.filterKeys = this.getAvailableFilters() this.filterKeys = this.getAvailableFilters()
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="navbar-collapse"> <div class="navbar-collapse">
<ul class="nav nav-header"> <ul class="nav nav-header">
<li class="col-sm-4"> <li class="col-sm-4">
<div class="checkbox pull-left"> <div class="checkbox pull-left" v-if="enabledFilterOptions">
<label> <label>
<input type="checkbox" v-model="checked" @change="filterModeChange"> {{ $t('vsp-message.filter-option-desc') }} <input type="checkbox" v-model="checked" @change="filterModeChange"> {{ $t('vsp-message.filter-option-desc') }}
</label> </label>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav" v-if="filter"> <ul class="nav navbar-nav" v-if="filter && enabledFilter">
<li v-for="(item, index) in filter" :key="item.id" class="select-wrap col-sm-4"> <li v-for="(item, index) in filter" :key="item.id" class="select-wrap col-sm-4">
<multiselect <multiselect
:id="index" :id="index"
...@@ -81,13 +81,14 @@ ...@@ -81,13 +81,14 @@
props: [ props: [
'filter', 'filter',
'filterMode', 'filterMode',
'enabledFilter',
'enabledFilterOptions',
'enabledSearch', 'enabledSearch',
'enabledSort' 'enabledSort'
], ],
data () { data () {
return { return {
filtered: [], filtered: [],
checked: (this.filterMode === Shuffle.FilterMode.ALL),
searchBy: null, searchBy: null,
sortBy: null, sortBy: null,
sortOptions: [ sortOptions: [
...@@ -103,6 +104,11 @@ ...@@ -103,6 +104,11 @@
selectedFilters: {} selectedFilters: {}
} }
}, },
computed: {
checked () {
return (this.filterMode === Shuffle.FilterMode.ALL)
}
},
mounted () { mounted () {
this.checkUrlQueryParams() this.checkUrlQueryParams()
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment