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/ima=
geid.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 =3D "qrc:/gcompris/src/activities/imageid/resource/";
 var dataset =3D null;
 var lessons
+var wordList
 =

 function init(items_) {
     items =3D items_;
@@ -62,16 +63,20 @@ function initLevel() {
     items.bar.level =3D currentLevel + 1;
 =

     var currentLesson =3D lessons[currentLevel]
-    var wordList =3D Lang.getLessonWords(dataset, currentLesson)
+    wordList =3D Lang.getLessonWords(dataset, currentLesson)
+    Core.shuffle(wordList);
 =

     maxSubLevel =3D wordList.length;
     items.score.numberOfSubLevels =3D maxSubLevel;
 =

+    initSubLevel()
+}
+
+function initSubLevel() {
     // initialize sublevel
     items.score.currentSubLevel =3D currentSubLevel + 1;
     items.goodWord =3D wordList[currentSubLevel]
 =

-    Core.shuffle(allWords);
     var selectedWords =3D []
     selectedWords.push(items.goodWord.translatedTxt)
     for (var i =3D 0; i < wordList.length; i++) {
@@ -110,6 +115,7 @@ function nextSubLevel() {
     if( ++currentSubLevel >=3D maxSubLevel) {
         currentSubLevel =3D 0;
         nextLevel();
-    } else
-        initLevel();
+    } else {
+        initSubLevel();
+    }
 }