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

Musik lückenlos abspielen & Cookie-Hinweis rescaling angepasst

Browse Source
This commit is contained in:
silas
2018-09-25 12:42:24 +02:00
parent c8c5ccf737
commit 35b2f61d00
9 changed files with 108 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/module/Application/pwa/js/site/MenuSite.js
View File

@@ -3,7 +3,7 @@ import {LevelSite} from "./LevelSite";
import {ScaleHelper} from "../../../../../js/lib/pwa-assets";
import {TemplateContainer} from "../wordrotator/Segment/TemplateContainer";
import {MainMenuLevel} from "../wordrotator/Level/MainMenuLevel";
import {Helper} from "../../../../../js/lib/pwa-lib";
import {Helper, InitPromise} from "../../../../../js/lib/pwa-lib";
export class MenuSite extends WordRotatorBaseSite {
constructor(siteManager) {
@@ -73,7 +73,7 @@ export class MenuSite extends WordRotatorBaseSite {
playButton.style.width = levelStyle.getPropertyValue("width");
scaleHelper.scaleToFull(playButton.children[0], playButton, null, null, null, null, null, false);
await scaleHelper.scaleTo(0.17, levelNumber.parentElement, levelNumber.parentElement.parentElement, null, null, null, 10, null, false);
await scaleHelper.scaleTo(0.2, levelNumber.parentElement, levelNumber.parentElement.parentElement, null, null, null, 10, null, false);
scaleHelper.scaleToFull(levelNumber, levelNumber.parentElement, false, false, 8, null, null, false);
};
@@ -107,10 +107,23 @@ export class MenuSite extends WordRotatorBaseSite {
triangleTemplate.remove();
this.templateContainer = new TemplateContainer(leafSegmentTemplate, parentSegmentTemplate, rowSegmentTemplate, triangleTemplate);
if (Helper.nonNull(MenuSite.app._cookieClosePromise)) {
MenuSite.app._cookieClosePromise.then(() => {
if (this.listener) {
this.listener();
}
});
}
}
onPause(args) {
window.removeEventListener("resize", this.listener);
super.onPause(args);
}
}
}
MenuSite.app = null;
InitPromise.addPromise(app => {
MenuSite.app = app;
});

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

@@ -4,20 +4,19 @@ export class ParentSegment extends Segment {
static initListener() {
window.addEventListener("mousedown", (e) => {
ParentSegment.mouseDownTarget = e.target;
// ParentSegment.mouseDownTarget = e.originalTarget;
ParentSegment.clickPosition = {x: e.clientX, y: e.clientY};
});
window.addEventListener("mouseup", (e) => {
ParentSegment.mouseDownTarget = null;
});
window.addEventListener("touchstart", (e) => {
console.log("start", e);
if (e.targetTouches.length === 1) {
ParentSegment.mouseDownTarget = e.targetTouches[0].target;
ParentSegment.clickPosition = {x: e.targetTouches[0].clientX, y: e.targetTouches[0].clientY};
}
});
window.addEventListener("touchend", (e) => {
console.log("end", e);
ParentSegment.mouseDownTarget = null;
});
}
@@ -46,6 +45,7 @@ export class ParentSegment extends Segment {
self.rotate();
e.stopPropagation();
e.preventDefault();
console.log("mouseup", e);
}
};
}