Pulled process data method into Component class. Added range normalization to adapter.

Author: cesutherland

js/Component.js

@@ -108,16 +108,17 @@ Component.prototype = {
     var
       api = this.api,
       options = this.options,
+      preprocessor = this.preprocessor,
       data = data || options.data,
       config = config || options.config,
       clientData = data;
 
     if (!options.skipPreprocess && data) {
 
       if (data !== options.data) {
-        this.preprocessor.setData(data);
+        preprocessor.setData(data);
       } else {
-        this.preprocessor.reset();
+        preprocessor.reset();
       }
 
       clientData = [];
@@ -127,7 +128,29 @@ Component.prototype = {
           isArray = _.isArray(d),
           isFunction = _.isFunction(d),
           unprocessed = isArray ? d : (isFunction ? d : d.data),
-          processed = api.processData(unprocessed, config, this.node, this.preprocessor, options.processData);
+          processData = options.processData,
+          range = api.range(config),
+          min = range.min,
+          max = range.max,
+          resolution = this.node.clientWidth,
+          processed;
+
+        if (isFunction) {
+          processed = data(min, max, resolution);
+        } else if (processData) {
+          processData.apply(this, [{
+            preprocessor : preprocessor,
+            min : min,
+            max : max,
+            resolution : resolution
+          }]);
+          processed = preprocessor.getData();
+        } else {
+          processed = preprocessor
+            .bound(min, max)
+            .subsampleMinMax(resolution)
+            .getData();
+        }
 
         if (!isFunction && !isArray) {
           // Objects

js/adapters/flotr/Child.js

@@ -40,31 +40,13 @@ Child.prototype = {
     this.flotr = Flotr.draw(node, data, flotr);
   },
 
-  processData : function (data, flotr, node, preprocessor, processData) {
-
+  range : function (flotr) {
     var
-      options     = this.options,
-      resolution  = node.clientWidth,
-      axis        = flotr.xaxis,
-      min         = axis.min,
-      max         = axis.max;
-
-    if (_.isFunction(data)) {
-      return data(min, max, resolution);
-    } else if (processData) {
-      processData.apply(this, [{
-        preprocessor : preprocessor,
-        min : min,
-        max : max,
-        resolution : resolution
-      }]);
-    } else {
-      preprocessor
-        .bound(min, max)
-        .subsampleMinMax(resolution);
-    }
-
-    return preprocessor.getData();
+      axis  = flotr.xaxis;
+    return {
+      min : axis.min,
+      max : axis.max
+    };
   },
 
   // Transform for Flotr
@@ -73,7 +55,7 @@ Child.prototype = {
     var
       length = data[0].length,
       dimension = data.length,
-      newData = [],
+      transformed = [],
       point,
       i, j;
 
@@ -82,10 +64,10 @@ Child.prototype = {
       for (j = 0; j < dimension; j++) {
         point.push(data[j][i]);
       }
-      newData.push(point);
+      transformed.push(point);
     }
 
-    return newData;
+    return transformed;
   },
 
   getDataArray : function (data) {