Merge pull request #8 from JRigotti/master

performatic changes
samdoiron · Jun 11, 2014 · 29cb95d · 29cb95d
2 parents 80d0950 + 5dbd0a8
commit 29cb95d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/index.html b/index.html
@@ -4,13 +4,6 @@
   <meta charset="UTF-8">
   <title>Who Am I?</title>
   <link rel="stylesheet" href="css/main.css" />
-
-  <script src="js/vendor/jquery.min.js"></script>
-  <script src="js/vendor/lodash.js"></script>
-  <script src="js/vendor/raphael-min.js"></script>
-  <script src="js/vendor/g.raphael-min.js"></script>
-  <script src="js/vendor/piechart.js"></script>
-  <script src="js/main.js"></script>
 </head>
 <body>
   <h1>Who Am I?</h1>
@@ -26,5 +19,12 @@ <h1>Who Am I?</h1>
     </div>
 
     <div><button id="bottom-button" onclick="done()" style="display: none">done!</button></div>
+
+    <script src="js/vendor/jquery.min.js"></script>
+    <script src="js/vendor/lodash.js"></script>
+    <script src="js/vendor/raphael-min.js"></script>
+    <script src="js/vendor/g.raphael-min.js"></script>
+    <script src="js/vendor/piechart.js"></script>
+    <script src="js/main.js"></script>
 </body>
 </html>
diff --git a/js/main.js b/js/main.js
@@ -5,25 +5,28 @@ var BANNED_LINKS = [
 
 $(function () {
   $.getJSON('sites.json', function (parsed) {
-    // Web browsers change the URL after it is added.
-    var formatted = {};
+
+    var formatted = {}; // Web browsers change the URL after it is added.
+    var clickedLinks = [];
+    var squareElements = [];
 
     $('#bottom-button').css('display', 'block');
 
+    // Remove banned links
+    for (var i = 0; i < BANNED_LINKS.length; i++) {
+      delete parsed[BANNED_LINKS[i]];
+    }
+
     _.each(parsed, function (tags, url) {
       var a = document.createElement('a');
       a.href = url;
       a.innerHTML = '▇';
 
-      if (BANNED_LINKS.indexOf(a.href) === -1) {
-        $('#squares').append(a);
-      }
-
+      squareElements.push(a);
       formatted[a.href] = tags;
-    }),
-      clickedLinks = [];
+    });
 
-    $('#squares').css('display', 'block');
+    $('#squares').append(squareElements).css('display', 'block');
 
     window.done = function done() {
       var timesClicked = {};
@@ -46,17 +49,18 @@ $(function () {
         })
         .sortBy('times')
         .reverse()
-        .value(),
+        .value();
 
-        ol = document.createElement('ol');
        var ol = document.createElement('ol');
+       var listElements = [];
 
        _.each(sorted, function (cat) {
          var li = document.createElement('li');
          li.innerHTML = cat.interest;
-         ol.appendChild(li);
+         listElements.push(li);
        });
 
+      $(ol).append(listElements);
 
       if (sorted.length === 0) {
         document.body.innerHTML = '<h1>Could not determine interests</h1>';
@@ -101,7 +105,6 @@ $(function () {
       e.preventDefault();
       $(this).addClass('clicked');
       clickedLinks.push(this.href);
-      return false;
     });
   });
 });