summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-09-08 18:40:08 +0200
committerJules Laplace <julescarbon@gmail.com>2020-09-08 18:40:08 +0200
commit68fd1c1997e87f1ce620a7d1687adbb04ccd667b (patch)
tree35b8cf58276a174d33bac36d9ba4d96b3e24b563 /animism-align/frontend/app
parentd919bdd91a540050e792a11e9837223388fd6aa7 (diff)
scroll to beginning or end but not beyond
Diffstat (limited to 'animism-align/frontend/app')
-rw-r--r--animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js14
-rw-r--r--animism-align/frontend/app/views/audio/audio.actions.js1
2 files changed, 11 insertions, 4 deletions
diff --git a/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js b/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js
index 8efea56..dec451e 100644
--- a/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js
+++ b/animism-align/frontend/app/utils/vendor/keen-slider/keen-slider.js
@@ -156,8 +156,14 @@ function KeenSlider(initialContainer, initialOptions = {}) {
function eventWheel(e) {
if (!isTouchable()) return
if (touchActive) e.preventDefault()
- const delta = Math.abs(e.deltaY) > Math.abs(e.deltaX) ? e.deltaY : e.deltaX
- trackAdd(touchMultiplicator(delta, pubfuncs), e.timeStamp)
+ let delta = Math.abs(e.deltaY) > Math.abs(e.deltaX) ? e.deltaY : e.deltaX
+ const idx_trend = (trackPosition + delta) / (width / slidesPerView)
+ if (idx_trend < 0) {
+ delta = -trackPosition
+ } else if (idx_trend > slides.length - 1) {
+ delta = (width * (slides.length - 1) / slidesPerView) - trackPosition
+ }
+ trackAdd(delta)
}
function eventsAdd() {
@@ -474,8 +480,8 @@ function KeenSlider(initialContainer, initialOptions = {}) {
spacing / slidesPerView -
(spacing / slidesPerView) * (slidesPerView - 1))
- const scale_size = 0.7
- const scale = 1 - (scale_size - scale_size * trackSlidePositions[idx].portion)
+ // const scale_size = 0.7
+ // const scale = 1 - (scale_size - scale_size * trackSlidePositions[idx].portion)
const x = isVertialSlider() ? 0 : pos
const y = isVertialSlider() ? pos : 0
const transformString = `translate3d(${x}px, ${y}px, 0)` // scale(${scale})`
diff --git a/animism-align/frontend/app/views/audio/audio.actions.js b/animism-align/frontend/app/views/audio/audio.actions.js
index 9d9727d..179dc9c 100644
--- a/animism-align/frontend/app/views/audio/audio.actions.js
+++ b/animism-align/frontend/app/views/audio/audio.actions.js
@@ -4,6 +4,7 @@ import actions from 'app/actions'
import { session } from 'app/session'
const audioPlayer = document.createElement('audio')
+audioPlayer.volume = 0.0
audioPlayer.src = '/static/data_store/peaks/animismA080720.mp3'
audioPlayer.addEventListener('loadedmetadata', () => {
// console.log('audio duration:', audioPlayer.duration)