fixes #103 and #108

hhzl · Dec 19, 2016 · cf0885d · cf0885d
1 parent 6c90be0
commit cf0885d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/spec/learnwords2/LWBoxOfQuestionsSpec.js b/spec/learnwords2/LWBoxOfQuestionsSpec.js
@@ -304,7 +304,8 @@ describe("BoxOfQuestions", function() {
     var n = settings.numberOfOptions;
 
     var options = LW.getAnswerOptions();
-
+
+    expect(options).toBeArray();
     expect(options.length).toBe(n);
 
 

diff --git a/src/BoxOfQuestions.js b/src/BoxOfQuestions.js
@@ -42,7 +42,16 @@ function BoxOfQuestions(db) {
 
 
 
-
+        var _shuffle =function(a) {
+			 var j, x, i;
+		    for (i = a.length; i; i--) {
+		        j = Math.floor(Math.random() * i);
+		        x = a[i - 1];
+		        a[i - 1] = a[j];
+		        a[j] = x;
+		    };
+                    return a		   
+	};
 
 
 
@@ -231,7 +240,7 @@ function BoxOfQuestions(db) {
 
 
           };
-          return options
+          return _shuffle(options)
        },
 
 

diff --git a/src/LWdb.js b/src/LWdb.js
@@ -1,11 +1,3 @@
-
-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-// NOTE: pay special attention to how the number of Words is calculated
-// FIXME
-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-
-
 "use strict";
 // ----------------------------------------------------------------------
 // LearnWords 2 
@@ -298,7 +290,10 @@ var LWdb = function(name) {
                     _keysOfAllWords.push(key);
                 }
             };
+            // _setNumberOfWords(_keysOfAllWords.length);
+            // as putWord() updates n
             _indexHasBeenUpdated();
+
         };
         return _keysOfAllWords;
     },