Skip to content

Commit

Permalink
Remove Custom Interval filter and migrate to new ones #306
Browse files Browse the repository at this point in the history
  • Loading branch information
leogermani committed Oct 23, 2019
1 parent 28d9b1d commit f944265
Show file tree
Hide file tree
Showing 8 changed files with 199 additions and 501 deletions.
6 changes: 2 additions & 4 deletions src/admin/js/main.js
Expand Up @@ -23,7 +23,6 @@ import FormRelationship from '../../classes/metadata-types/relationship/FormRela
import FormTaxonomy from '../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
import FormSelectbox from '../../classes/metadata-types/selectbox/FormSelectbox.vue';

import FilterCustomInterval from '../../classes/filter-types/custom-interval/CustomInterval.vue';
import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
import FilterDate from '../../classes/filter-types/date/Date.vue';
import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
Expand Down Expand Up @@ -59,7 +58,7 @@ import FormNumericListInterval from '../../classes/filter-types/numeric-list-int

// Configure and Register Plugins
Vue.use(Buefy, {
defaultTooltipAnimated: true
defaultTooltipAnimated: true
});
Vue.use(VTooltip);
Vue.use(VueMasonry);
Expand Down Expand Up @@ -87,7 +86,6 @@ Vue.component('tainacan-form-item', TainacanFormItem);
Vue.component('tainacan-filter-item', TainacanFiltersList);

/* Filters */
Vue.component('tainacan-filter-custom-interval', FilterCustomInterval);
Vue.component('tainacan-filter-numeric', FilterNumeric);
Vue.component('tainacan-filter-date', FilterDate);
Vue.component('tainacan-filter-selectbox', FilterSelectbox);
Expand Down Expand Up @@ -128,7 +126,7 @@ new Vue({
render: h => h(AdminPage)
});

// Display Icons only once everything is loaded
// Display Icons only once everything is loaded
function listen(evnt, elem, func) {
if (elem.addEventListener) // W3C DOM
elem.addEventListener(evnt,func,false);
Expand Down
15 changes: 6 additions & 9 deletions src/admin/js/theme-main.js
Expand Up @@ -5,7 +5,6 @@ import VTooltip from 'v-tooltip';
import VueMasonry from 'vue-masonry-css';

// Custom elements
import FilterCustomInterval from '../../classes/filter-types/custom-interval/CustomInterval.vue';
import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
import FilterDate from '../../classes/filter-types/date/Date.vue';
import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
Expand Down Expand Up @@ -34,7 +33,7 @@ import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusH

// Configure and Register Plugins
Vue.use(Buefy, {
defaultTooltipAnimated: true
defaultTooltipAnimated: true
});
Vue.use(VTooltip);
Vue.use(VueMasonry);
Expand All @@ -44,11 +43,9 @@ Vue.use(RouterHelperPlugin);
Vue.use(StatusHelperPlugin);
Vue.use(ConsolePlugin, {visual: false});


Vue.component('tainacan-filter-item', TaincanFiltersList);

/* Filters */
Vue.component('tainacan-filter-custom-interval', FilterCustomInterval);
Vue.component('tainacan-filter-numeric', FilterNumeric);
Vue.component('tainacan-filter-date', FilterDate);
Vue.component('tainacan-filter-selectbox', FilterSelectbox);
Expand Down Expand Up @@ -79,7 +76,7 @@ import ThemeItemsList from '../theme-items-list.vue';
export const ThemeItemsListing = new Vue({
el: '#tainacan-items-page',
store,
router: routerTheme,
router: routerTheme,
data: {
termId: '',
taxonomy: '',
Expand All @@ -90,9 +87,9 @@ export const ThemeItemsListing = new Vue({
},
render: h => h(ThemeItemsList),
beforeMount () {

this.collectionId = this.$el.attributes['collection-id'] != undefined ? this.$el.attributes['collection-id'].value : undefined;

if (this.$el.attributes['default-view-mode'] != undefined)
this.defaultViewMode = this.$el.attributes['default-view-mode'].value;
else
Expand All @@ -107,10 +104,10 @@ export const ThemeItemsListing = new Vue({
this.taxonomy = this.$el.attributes['taxonomy'].value;

}

});

// Display Icons only once everything is loaded
// Display Icons only once everything is loaded
function listen(evnt, elem, func) {
if (elem.addEventListener) // W3C DOM
elem.addEventListener(evnt,func,false);
Expand Down
261 changes: 0 additions & 261 deletions src/classes/filter-types/custom-interval/CustomInterval.vue

This file was deleted.

0 comments on commit f944265

Please sign in to comment.