Some minor tweaks and minifying Pull Request #95

nv.d3.js

@@ -4,7 +4,6 @@ var nv = {
   dev: true //set false when in production
 };
 
-
 window.nv = nv;
 
 nv.tooltip = {}; // For the tooltip system
@@ -16,21 +15,20 @@ nv.logs = {}; //stores some statistics and potential error messages
 
 nv.dispatch = d3.dispatch('render_start', 'render_end');
 
+// *************************************************************************
+//  Development render timers - disabled if dev = false
 
+if (nv.dev) {
+  nv.dispatch.on('render_start', function(e) {
+    nv.logs.startTime = +new Date();
+  });
 
-// ********************************************
-//  Public Core NV functions
-
-nv.dispatch.on('render_start', function(e) {
-  nv.logs.startTime = +new Date;
-});
-
-nv.dispatch.on('render_end', function(e) {
-  nv.logs.endTime = +new Date;
-  nv.logs.totalTime = nv.logs.endTime - nv.logs.startTime;
-  if (nv.dev && console.log) console.log('total', nv.logs.totalTime); //used for development, to keep track of graph generation times
-});
-
+  nv.dispatch.on('render_end', function(e) {
+    nv.logs.endTime = +new Date();
+    nv.logs.totalTime = nv.logs.endTime - nv.logs.startTime;
+    nv.log('total', nv.logs.totalTime); // used for development, to keep track of graph generation times
+  });
+}
 
 // ********************************************
 //  Public Core NV functions
@@ -39,7 +37,7 @@ nv.dispatch.on('render_end', function(e) {
 nv.log = function() {
   if (nv.dev && console.log) console.log.apply(console, arguments);
   return arguments[arguments.length - 1];
-}
+};
 
 
 nv.render = function render(step) {
@@ -48,28 +46,26 @@ nv.render = function render(step) {
   render.active = true;
   nv.dispatch.render_start();
 
-  setTimeout(function(){
+  setTimeout(function() {
     var chart;
 
     for (var i = 0; i < step && (graph = render.queue[i]); i++) {
       chart = graph.generate();
-      if (typeof graph.callback === 'function') graph.callback(chart);
+      if (typeof graph.callback == typeof(Function)) graph.callback(chart);
       nv.graphs.push(chart);
     }
 
     render.queue.splice(0, i);
 
     if (render.queue.length) setTimeout(arguments.callee, 0);
-    else { 
-      nv.render.active = false;
-      nv.dispatch.render_end();
-    }
+    else { nv.render.active = false; nv.dispatch.render_end(); }
   }, 0);
 };
+
 nv.render.queue = [];
 
 nv.addGraph = function(obj) {
-  if (typeof arguments[0] === 'function')
+  if (typeof arguments[0] === typeof(Function))
     obj = {generate: arguments[0], callback: arguments[1]};
 
   nv.render.queue.push(obj);
@@ -77,13 +73,13 @@ nv.addGraph = function(obj) {
   if (!nv.render.active) nv.render();
 };
 
-nv.identity = function(d) { return d };
+nv.identity = function(d) { return d; };
 
 nv.strip = function(s) { return s.replace(/(\s|&)/g,''); };
 
 function daysInMonth(month,year) {
   return (new Date(year, month+1, 0)).getDate();
-};
+}
 
 function d3_time_range(floor, step, number) {
   return function(t0, t1, dt) {
@@ -92,15 +88,15 @@ function d3_time_range(floor, step, number) {
     if (dt > 1) {
       while (time < t1) {
         var date = new Date(+time);
-        if (!(number(date) % dt)) times.push(date);
+        if ((number(date) % dt === 0)) times.push(date);
         step(time);
       }
     } else {
-      while (time < t1) times.push(new Date(+time)), step(time);
+      while (time < t1) { times.push(new Date(+time)); step(time); }
     }
     return times;
   };
-};
+}
 
 d3.time.monthEnd = function(date) {
   return new Date(date.getFullYear(), date.getMonth(), 0);
@@ -114,6 +110,7 @@ d3.time.monthEnds = d3_time_range(d3.time.monthEnd, function(date) {
   }
 );
 
+
 /*****
  * A no frills tooltip implementation.
  *****/

src/core.js

@@ -19,13 +19,13 @@ nv.dispatch = d3.dispatch('render_start', 'render_end');
 
 if (nv.dev) {
   nv.dispatch.on('render_start', function(e) {
-    nv.log.startTime = +new Date();
+    nv.logs.startTime = +new Date();
   });
 
   nv.dispatch.on('render_end', function(e) {
-    nv.log.endTime = +new Date();
-    nv.log.totalTime = nv.log.endTime - nv.log.startTime;
-    if (console.log) console.log('total', nv.log.totalTime); // used for development, to keep track of graph generation times
+    nv.logs.endTime = +new Date();
+    nv.logs.totalTime = nv.logs.endTime - nv.logs.startTime;
+    nv.log('total', nv.logs.totalTime); // used for development, to keep track of graph generation times
   });
 }
 
@@ -109,4 +109,3 @@ d3.time.monthEnds = d3_time_range(d3.time.monthEnd, function(date) {
   }
 );
 
-console.log(d3.time.monthEnds);