Exercises 5-7 source refactored

nitishdayal · nitishdayal · commit 29c19f692256 · 2017-05-12T19:58:31.000-07:00
3 more down. I think.
diff --git a/exercises/05 - Flex Panel Gallery/index.html b/exercises/05 - Flex Panel Gallery/index.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
   <meta charset="UTF-8">
   <title>Flex Panels 💪</title>
@@ -27,29 +26,26 @@
     .panel1 {
       background-image: url(https://source.unsplash.com/gYl-UtwNg_I/1500x1500);
     }
-    
+
     .panel2 {
       background-image: url(https://source.unsplash.com/1CD3fd8kHnE/1500x1500);
     }
-    
+
     .panel3 {
       background-image: url(https://images.unsplash.com/photo-1465188162913-8fb5709d6d57?ixlib=rb-0.3.5&q=80&fm=jpg&crop=faces&cs=tinysrgb&w=1500&h=1500&fit=crop&s=967e8a713a4e395260793fc8c802901d);
     }
-    
+
     .panel4 {
       background-image: url(https://source.unsplash.com/ITjiVXcwVng/1500x1500);
     }
-    
+
     .panel5 {
       background-image: url(https://source.unsplash.com/3MNzGlQM7qs/1500x1500);
     }
   </style>
-
 </head>
-
 <body>
 
-
   <div class="panels">
     <div class="panel panel1">
       <p>Hey</p>
@@ -81,20 +77,18 @@
   <script>
     const panels = document.querySelectorAll('.panel')
 
-    function togglePanel() {
-      this.classList.toggle('open');
+    const togglePanel = (p, e) => {
+      p.classList.toggle('open');
     }
 
-    function toggleText(e) {
-      if (e.propertyName.includes('flex')) this.classList.toggle('open-active');
+    const toggleText = (p, e) => {
+      if (e.propertyName.includes('flex')) p.classList.toggle('open-active');
     }
 
-    panels.forEach(panel => panel.addEventListener('click', togglePanel));
-    panels.forEach(panel => panel.addEventListener('transitionend', toggleText));
+    panels.forEach(panel => {
+      panel.addEventListener('click', togglePanel.bind(null, panel))
+      panel.addEventListener('transitionend', toggleText.bind(null, panel))
+    })
   </script>
-
-
-
 </body>
-
-</html>
+</html>
diff --git a/exercises/06 - Type Ahead/index.html b/exercises/06 - Type Ahead/index.html
@@ -31,10 +31,9 @@
         .then(data => cities.push(...data))
 
       // Step 4
-      const matchInput = (inputString, cities) => cities.filter((location) => {
-        const regex = new RegExp(inputString, 'gi');
-        return location.city.match(regex) || location.state.match(regex)
-      });
+      const matchInput = (inputString, cities) => cities.filter(({city, state}) => (
+          city.match(new RegExp(inputString, 'gi')) || state.match(new RegExp(inputString, 'gi'))
+      ));
 
       // Step 6
       const numberWithCommas = (x) => x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
diff --git a/exercises/07 - Array Cardio Day 2/index.html b/exercises/07 - Array Cardio Day 2/index.html
@@ -25,32 +25,33 @@
       { text: 'Nice Nice Nice!', id: 542328 }
     ];
 
+    const yr = new Date().getFullYear();
     // Some and Every Checks
-    // Array.prototype.some() 
+    // Array.prototype.some()
     // is at least one person 19?
-    const isAdult = people.some(person => ((new Date()).getFullYear()) - person.year >= 19);
+    const isAdult = people.some(({year}) => yr - year >= 19);
     console.log({ isAdult });
 
     // Array.prototype.every() // is everyone 19?
-    const allAdults = people.every(person => ((new Date()).getFullYear()) - person.year >= 19);
+    const allAdults = people.every(({year}) => yr - year >= 19);
     console.log({ allAdults });
 
     // Array.prototype.find()
     // Find is like filter, but instead returns just the one you are looking for
     // find the comment with the ID of 823423
-    const comment = comments.find(comment => comment.id === 823423);
+    const comment = comments.find(({id}) => id === 823423);
     console.log(comment);
 
     // Array.prototype.findIndex()
     // Find the comment with this ID 823423 and delete it
-    const index = comments.findIndex(comment => comment.id === 823423);
+    const index = comments.findIndex(({id}) => id === 823423);
     const newComments = [
       ...comments.slice(0, index),
       ...comments.slice(index + 1)
     ];
-    console.log(newComments)
+    console.table(newComments)
 
   </script>
 </body>
 
-</html>
+</html>
