From 4a5d41fe70a51bac62bec8ceb2f29212d685232f Mon Sep 17 00:00:00 2001 From: silas Date: Wed, 26 Sep 2018 15:09:40 +0200 Subject: [PATCH] bugfix --- log/error.log | 1 + log/log.log | 1 + public/js/app.js | 4 ++-- src/module/Application/pwa/js/site/LevelSite.js | 2 +- .../Application/pwa/js/wordrotator/Segment/ParentSegment.js | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/log/error.log b/log/error.log index c603e2a..56c196d 100755 --- a/log/error.log +++ b/log/error.log @@ -23,3 +23,4 @@ 2018-09-26T14:01:02+02:00 ERR (3): 2018-09-26T14:58:31+02:00 ERR (3): 2018-09-26T14:59:27+02:00 ERR (3): +2018-09-26T15:08:13+02:00 ERR (3): diff --git a/log/log.log b/log/log.log index c603e2a..56c196d 100755 --- a/log/log.log +++ b/log/log.log @@ -23,3 +23,4 @@ 2018-09-26T14:01:02+02:00 ERR (3): 2018-09-26T14:58:31+02:00 ERR (3): 2018-09-26T14:59:27+02:00 ERR (3): +2018-09-26T15:08:13+02:00 ERR (3): diff --git a/public/js/app.js b/public/js/app.js index 62e70b5..24e72fc 100755 --- a/public/js/app.js +++ b/public/js/app.js @@ -5043,7 +5043,7 @@ class ParentSegment extends Segment { let self = this; this.touchendListener = function (e) { let target = document.elementFromPoint(e.changedTouches[0].pageX, e.changedTouches[0].pageY); - if (e.targetTouches.length === 0 && e.changedTouches.length === 1 && self.element.contains(ParentSegment.mouseDownTarget) && self.element.contains()) { + if (e.targetTouches.length === 0 && e.changedTouches.length === 1 && self.element.contains(ParentSegment.mouseDownTarget) && self.element.contains(target)) { self.rotate(ParentSegment.mouseDownTarget, target); e.stopPropagation(); e.preventDefault(); @@ -5773,7 +5773,7 @@ class LevelSite extends WordRotatorBaseSite { let settingsManager = SettingsManager.getInstance(); let soundManager = SoundManager.getInstance(); - soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound"), volume:0.7}, SoundManager.CHANNELS.SOUND); + soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound", true), volume:0.7}, SoundManager.CHANNELS.SOUND); return super.onConstruct(args); } diff --git a/src/module/Application/pwa/js/site/LevelSite.js b/src/module/Application/pwa/js/site/LevelSite.js index 871f12a..54be262 100755 --- a/src/module/Application/pwa/js/site/LevelSite.js +++ b/src/module/Application/pwa/js/site/LevelSite.js @@ -37,7 +37,7 @@ export class LevelSite extends WordRotatorBaseSite { let settingsManager = SettingsManager.getInstance(); let soundManager = SoundManager.getInstance(); - soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound"), volume:0.7}, SoundManager.CHANNELS.SOUND); + soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound", true), volume:0.7}, SoundManager.CHANNELS.SOUND); return super.onConstruct(args); } diff --git a/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js b/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js index db233d3..0379560 100755 --- a/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js +++ b/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js @@ -34,7 +34,7 @@ export class ParentSegment extends Segment { let self = this; this.touchendListener = function (e) { let target = document.elementFromPoint(e.changedTouches[0].pageX, e.changedTouches[0].pageY); - if (e.targetTouches.length === 0 && e.changedTouches.length === 1 && self.element.contains(ParentSegment.mouseDownTarget) && self.element.contains()) { + if (e.targetTouches.length === 0 && e.changedTouches.length === 1 && self.element.contains(ParentSegment.mouseDownTarget) && self.element.contains(target)) { self.rotate(ParentSegment.mouseDownTarget, target); e.stopPropagation(); e.preventDefault();