Merge branch 'fadialset-w3'

fadialset · fadialset · commit e2c63b78b8a9 · 2020-12-22T18:28:21.000+01:00
diff --git a/Week3/js-exercises/ex2-RemoveDuplicates.js b/Week3/js-exercises/ex2-RemoveDuplicates.js
@@ -25,8 +25,8 @@ function checkSolution(array) {
 
 // WRITE YOUR FUNCTION HERE
 function removeDuplicates(array){
-  const newArray = array.filter((item,index) => array.indexOf(item)=== index);
-console.log(newArray);
+ return Array.from(new Set(array)); 
+ 
 };
 
 const letters = ['a', 'b', 'c', 'd', 'a', 'e', 'f', 'c', 'b'];
diff --git a/Week3/js-exercises/ex5-LotteryMachine.js b/Week3/js-exercises/ex5-LotteryMachine.js
@@ -43,21 +43,16 @@ function threeFive(startIndex, stopIndex, threeCallback, fiveCallback) {
  console.log(numbers);
 
   // start at beginning of array and check if you should call threeCallback or fiveCallback or go on to next
-  numbers.map((number) => {
+  numbers.forEach((number) => {
     if (number % 3 === 0) {
        threeCallback();
     }
     if (number % 5 === 0) {
        fiveCallback();
     }
-    if (number % 5 === 0 && number % 3 === 0) {
-      threeCallback();
-      fiveCallback();
-    }
-  })
-  }
-
-console.log(threeFive(10, 15, sayThree, sayFive));
+  });
+}
+threeFive(10, 15, threeCallback, fiveCallback);
 
 
 // Should create an array [10,11,12,13,14,15]
