random

app/js/index.js

@@ -8,8 +8,19 @@ if (typeof(sw) == 'undefined') {
 	
 	
 	//helper functions	
-	var shuffle = function(obj) {
+	var shuffle = function(myArray) {
-		return obj.sort( function() { return 0.5 - Math.random(); } );
+		var i = myArray.length, j, tempi, tempj;
+		if (i === 0)
+			return myArray;
+		while (--i) {
+			j = Math.floor(Math.random() * (i + 1));
+			tempi = myArray[i];
+			tempj = myArray[j];
+			myArray[i] = tempj;
+			myArray[j] = tempi;
+		}
+		
+		return myArray;
 	};
 	
 	var getKey = function(obj) {
@@ -23,20 +34,13 @@ if (typeof(sw) == 'undefined') {
 		var words = sw.words[Math.round(Math.random() * sw.words.length)];
 		
 		var word = getKey(words);
-		var similar = words[word];
+		var similar = shuffle(words[word]);
-		//i really should include _
-		var filtered = [];
-		for(var i=0; i<similar.length; i++) {
-			if(similar[i] != word) {
-				filtered.push(similar[i]);
-			}
-		}
-		filtered = shuffle(filtered);
-		filtered = filtered.slice(0, 3);
-		filtered.push(word);
-		filtered = shuffle(filtered);
 
-		return {word: word, similar: filtered};
+		similar = similar.slice(0, 3);
+		similar.push(word);
+		similar = shuffle(similar);
+		
+		return {word: word, similar: similar};
 	};
 	
 	var startGame = function(word) {