From bdd8d19af10112c12ba55547079d01e163437f1d Mon Sep 17 00:00:00 2001 From: silas Date: Tue, 13 Nov 2018 12:31:36 +0100 Subject: [PATCH] wordLength to check update --- public/js/app.js | 8 ++++++-- src/module/Application/pwa/js/site/LevelSite.js | 8 ++++++-- src/module/Application/src/Controller/IndexController.php | 4 ++-- test/test.testcafe.js | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index a127d94..29a1fd2 100755 --- a/public/js/app.js +++ b/public/js/app.js @@ -6808,10 +6808,9 @@ class LevelSite extends WordRotatorBaseSite { triangleTemplate.remove(); columnTemplate.remove(); - let self = this; let continueButton = this.findBy("#continue-button"); continueButton.addEventListener("click", () => { - self.nextLevel(); + this.nextLevel(); }); let wonText = this.findBy("#won-text"); @@ -6921,6 +6920,11 @@ class LevelSite extends WordRotatorBaseSite { let scaleHelper = new ScaleHelper(); this.levelScaler = await scaleHelper.scaleToFull(levelSegment, levelSegment.parentElement, false, false, 1, level.words[0].length * 1.5, null, 0); + //Waiting for Level to be done + if (level.id === this.level.id){ + return new Promise((resolve) => setTimeout(resolve, 50)); + } + this.level = level; this.levelCounterAction.innerText = this.levelCounter; this.levelNumberScaler(); diff --git a/src/module/Application/pwa/js/site/LevelSite.js b/src/module/Application/pwa/js/site/LevelSite.js index f460871..e431b92 100755 --- a/src/module/Application/pwa/js/site/LevelSite.js +++ b/src/module/Application/pwa/js/site/LevelSite.js @@ -69,10 +69,9 @@ export class LevelSite extends WordRotatorBaseSite { triangleTemplate.remove(); columnTemplate.remove(); - let self = this; let continueButton = this.findBy("#continue-button"); continueButton.addEventListener("click", () => { - self.nextLevel(); + this.nextLevel(); }); let wonText = this.findBy("#won-text"); @@ -182,6 +181,11 @@ export class LevelSite extends WordRotatorBaseSite { let scaleHelper = new ScaleHelper(); this.levelScaler = await scaleHelper.scaleToFull(levelSegment, levelSegment.parentElement, false, false, 1, level.words[0].length * 1.5, null, 0); + //Waiting for Level to be done + if (level.id === this.level.id){ + return new Promise((resolve) => setTimeout(resolve, 50)); + } + this.level = level; this.levelCounterAction.innerText = this.levelCounter; this.levelNumberScaler(); diff --git a/src/module/Application/src/Controller/IndexController.php b/src/module/Application/src/Controller/IndexController.php index a42c10e..17ff321 100755 --- a/src/module/Application/src/Controller/IndexController.php +++ b/src/module/Application/src/Controller/IndexController.php @@ -10,8 +10,8 @@ use Zend\View\Model\ViewModel; class IndexController extends OnlineController { - const LENGTH_WORDS_MIN = 8; - const LENGTH_WORDS_MAX = 8; + const LENGTH_WORDS_MIN = 12; + const LENGTH_WORDS_MAX = 12; const NUMBER_WORDS_TO_CHECK_SIMULTANEOUSLY = 8; diff --git a/test/test.testcafe.js b/test/test.testcafe.js index 5b320a4..8567cea 100644 --- a/test/test.testcafe.js +++ b/test/test.testcafe.js @@ -1,7 +1,7 @@ import {Selector} from 'testcafe'; import {ClientFunction} from 'testcafe'; -let isLocal = true; +let isLocal = false; let isMobile = false; const checkMatrix = async (matrixStringSelector, shouldValues, timeout) => { @@ -118,7 +118,7 @@ const SEGMENT = { TWENTYONE: 20 }; -test.only('Play', async t => { +test('Play', async t => { let levelNumber = 1; await waitForMainMenu(t);