Cleaned up code

sbstjn · sbstjn · commit 03178697019a · 2014-05-23T21:19:02.000+02:00
diff --git a/source/javascripts/main.js b/source/javascripts/main.js
@@ -1,20 +1,21 @@
 //= require_tree .
 
-/* global console, Lib */
+/* global Lib, Timeline */
 
 (function(){
   'use strict';
 
   Lib.ready(function() {
-    new Timeline("timeline", [
+    /* jshint -W031 */
+    new Timeline('timeline', [
       ['2002', '05/2007', 'Lorem ipsum dolor sit amet #1', 'lorem'],
       ['2002', '06/2006', 'Lorem ipsum dolor sit amet #2', 'lorem'],
       ['05/2004', '07/2004', 'Lorem ipsum dolor sit amet #3', 'ipsum'],
       ['06/2007', 'Lorem ipsum dolor sit amet #4'],
       ['11/2007', '03/2009', 'Lorem ipsum dolor sit amet #5', 'dolor'],
       ['07/2008', '07/2009', 'Lorem ipsum dolor sit amet #6', 'lorem'],
       ['01/2009', '03/2012', 'Lorem ipsum dolor sit amet #7', 'sit'],
-      ['2010', '10/2011', 'Lorem ipsum dolor sit amet #8', 'ipsum'],
+      ['2010', '10/2011', 'Lorem ipsum dolor sit amet #8', 'ipsum']
     ]);
 
   });
diff --git a/source/javascripts/timesheet.js b/source/javascripts/timesheet.js
@@ -25,19 +25,18 @@
     var html = [];
 
     for (var n = 0, m = this.data.length; n < m; n++) {
-      var lne = [];
       var cur = this.data[n];
 
-      console.log(cur)
-
-      var line = '<span class="bubble bubble-' + (cur.type || 'default') + '" data-duration="' + (cur.end ? Math.round((cur.end-cur.start)/1000/60/60/24/39) : '') + '"></span>'
-        + '<span class="date">'
-        + (cur.start.hasMonth ? this.formatMonth(cur.start.getMonth() + 1) + '/' : '' ) + cur.start.getFullYear()
-        + (cur.end ? '-' + ((cur.end.hasMonth ? this.formatMonth(cur.end.getMonth() + 1) + '/' : '' ) + cur.end.getFullYear()) : '')
-        + '</span> '
-        + '<span class="label">'
-        + cur.label
-        + '</span>';
+      var line = [
+        '<span class="bubble bubble-' + (cur.type || 'default') + '" data-duration="' + (cur.end ? Math.round((cur.end-cur.start)/1000/60/60/24/39) : '') + '"></span>',
+        '<span class="date">',
+        (cur.start.hasMonth ? this.formatMonth(cur.start.getMonth() + 1) + '/' : '' ) + cur.start.getFullYear(),
+        (cur.end ? '-' + ((cur.end.hasMonth ? this.formatMonth(cur.end.getMonth() + 1) + '/' : '' ) + cur.end.getFullYear()) : ''),
+        '</span> ',
+        '<span class="label">',
+        cur.label,
+        '</span>'
+      ];
 
       html.push('<li>' + line + '</li>');
     }
@@ -74,7 +73,7 @@
       var beg = this.parseDate(data[n][0]);
       var end = data[n].length === 4 ? this.parseDate(data[n][1]) : null;
       var lbl = data[n][2] || data[n][1];
-      var cat = data[n][3] || 'default'
+      var cat = data[n][3] || 'default';
 
       if (beg.getFullYear() < this.year.min) {
         this.year.min = beg.getFullYear();
@@ -88,7 +87,7 @@
 
       this.data.push({start: beg, end: end, label: lbl, type: cat});
     }
-  }
+  };
 
   window.Timeline = Timeline;
 })();
