From cdaa95811806f4a8a4379f221bffe2ff0f961323 Mon Sep 17 00:00:00 2001 From: Tom Raithel Date: Wed, 15 Feb 2017 08:42:52 +0100 Subject: [PATCH] Small fixes regarding pjax and animation --- js/details.js | 7 +++---- js/filter.js | 4 ++-- js/radar.js | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/js/details.js b/js/details.js index 3ea231f..51602b9 100644 --- a/js/details.js +++ b/js/details.js @@ -27,10 +27,9 @@ const animation = (steps) => { } const initDetails = (element, fromPjax) => { - console.log('app'); - // if (fromPjax !== true) { - // return; - // } + if (fromPjax !== true) { + return; + } element.classList.add('animate'); element.classList.add('animate--curtain'); diff --git a/js/filter.js b/js/filter.js index 65217b2..b55b293 100644 --- a/js/filter.js +++ b/js/filter.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import applyPjax from './pjax'; -const initFilter = element => { +const initFilter = (element) => { const index = JSON.parse(element.getAttribute('data-index')); const filter = new Vue({ @@ -26,7 +26,7 @@ const initFilter = element => { return visibleItems.length > 0; }, }, - created() { + mounted() { applyPjax(); }, updated() { diff --git a/js/radar.js b/js/radar.js index 671340a..835736e 100644 --- a/js/radar.js +++ b/js/radar.js @@ -2,17 +2,17 @@ import filter from './filter'; import details from './details'; import applyPjax from './pjax'; -const enhanceComponent = (selector, enhancer) => { +const enhanceComponent = (selector, enhancer, fromPjax = false) => { const $filter = [].slice.call(document.querySelectorAll(selector)); - $filter.map(enhancer); + $filter.map((e) => enhancer(e, fromPjax)); } -const enhanceComponents = () => { - enhanceComponent('.js--filter', filter); - enhanceComponent('.js--details', details); +const enhanceComponents = (fromPjax) => { + enhanceComponent('.js--filter', filter, fromPjax); + enhanceComponent('.js--details', details, fromPjax); } applyPjax(); enhanceComponents(); -document.addEventListener("pjax:success", enhanceComponents); +document.addEventListener("pjax:success", () => enhanceComponents(true));