summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/utils
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-11-24 14:29:13 +0100
committerJules Laplace <julescarbon@gmail.com>2020-11-24 14:29:13 +0100
commit2189b9a950cd662e8b1a59c0a9e9a7ea43add587 (patch)
tree9034e14e80fc64b51e0d811855be95fda97addb5 /animism-align/frontend/app/utils
parent7baa798a1d523239752cf36cf22547683c7971a6 (diff)
fix pausing, ff/sf percentage bar, copy link
Diffstat (limited to 'animism-align/frontend/app/utils')
-rw-r--r--animism-align/frontend/app/utils/index.js6
-rw-r--r--animism-align/frontend/app/utils/oktween.js2
2 files changed, 7 insertions, 1 deletions
diff --git a/animism-align/frontend/app/utils/index.js b/animism-align/frontend/app/utils/index.js
index 016bb76..693a185 100644
--- a/animism-align/frontend/app/utils/index.js
+++ b/animism-align/frontend/app/utils/index.js
@@ -15,6 +15,9 @@ export const toArray = a => Array.from(a)
export const isiPhone = !!((navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)))
export const isiPad = !!(navigator.userAgent.match(/iPad/i))
export const isAndroid = !!(navigator.userAgent.match(/Android/i))
+export const isFirefox = !!(navigator.userAgent.match(/Firefox/i))
+export const isChrome = !!(navigator.userAgent.match(/Chrome/i))
+export const isSafari = !isChrome && !!(navigator.userAgent.match(/Safari/i))
export const isMobile = isiPhone || isiPad || isAndroid
export const isHandheld = isiPhone || (isAndroid && window.innerWidth <= 760)
export const isTablet = isMobile && window.innerWidth > 760
@@ -22,6 +25,9 @@ export const isDesktop = !isMobile
const htmlClassList = document.body.parentNode.classList
htmlClassList.add(isDesktop ? 'desktop' : 'mobile')
+if (isFirefox) htmlClassList.add('firefox')
+if (isSafari) htmlClassList.add('safari')
+if (isChrome) htmlClassList.add('chrome')
/* Default image dimensions */
diff --git a/animism-align/frontend/app/utils/oktween.js b/animism-align/frontend/app/utils/oktween.js
index 4388ad4..fdf5194 100644
--- a/animism-align/frontend/app/utils/oktween.js
+++ b/animism-align/frontend/app/utils/oktween.js
@@ -64,7 +64,7 @@ oktween.update = (t) => {
tweens.forEach((tween, i) => {
const dt = Math.min(1.0, (t - tween.start) / tween.duration)
tween.tick++
- if (dt < 0 || (dt < 1 && (tween.tick % tween.skip != 0))) return
+ if (dt < 0 || (dt < 1 && (tween.tick % tween.skip != 0)) || tween.done) return
const ddt = tween.easing(dt)
tween.dt = ddt
tween.keys.forEach((prop) => {