[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris/devel2] src/activities/imageid: imageid, shuffle each level when we enter it
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2014-12-31 18:34:15
Message-ID: E1Y6O63-0001M6-TA () scm ! kde ! org
[Download RAW message or body]

Git commit 3f5ac0129804b73cfed6710107bc74a1f2b771f0 by Bruno Coudoin.
Committed on 19/12/2014 at 15:09.
Pushed by bcoudoin into branch 'devel2'.

imageid, shuffle each level when we enter it

M  +10   -4    src/activities/imageid/imageid.js

http://commits.kde.org/gcompris/3f5ac0129804b73cfed6710107bc74a1f2b771f0

diff --git a/src/activities/imageid/imageid.js b/src/activities/imageid/imageid.js
index e5c4fb1..2aaf409 100755
--- a/src/activities/imageid/imageid.js
+++ b/src/activities/imageid/imageid.js
@@ -35,6 +35,7 @@ var items;
 var baseUrl = "qrc:/gcompris/src/activities/imageid/resource/";
 var dataset = null;
 var lessons
+var wordList
 
 function init(items_) {
     items = items_;
@@ -62,16 +63,20 @@ function initLevel() {
     items.bar.level = currentLevel + 1;
 
     var currentLesson = lessons[currentLevel]
-    var wordList = Lang.getLessonWords(dataset, currentLesson)
+    wordList = Lang.getLessonWords(dataset, currentLesson)
+    Core.shuffle(wordList);
 
     maxSubLevel = wordList.length;
     items.score.numberOfSubLevels = maxSubLevel;
 
+    initSubLevel()
+}
+
+function initSubLevel() {
     // initialize sublevel
     items.score.currentSubLevel = currentSubLevel + 1;
     items.goodWord = wordList[currentSubLevel]
 
-    Core.shuffle(allWords);
     var selectedWords = []
     selectedWords.push(items.goodWord.translatedTxt)
     for (var i = 0; i < wordList.length; i++) {
@@ -110,6 +115,7 @@ function nextSubLevel() {
     if( ++currentSubLevel >= maxSubLevel) {
         currentSubLevel = 0;
         nextLevel();
-    } else
-        initLevel();
+    } else {
+        initSubLevel();
+    }
 }

[prev in list] [next in list] [prev in thread] [next in thread]