Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
silas 2018-09-26 15:09:40 +02:00
parent cc83eee5b4
commit 4a5d41fe70
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
log/error.log
View File

@ -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):

1
log/log.log
View File

@ -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):

4
public/js/app.js
View File

@ -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);
}

2
src/module/Application/pwa/js/site/LevelSite.js
View File

@ -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);
}

2
src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js
View File

@ -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();