Skip to content

Commit

Permalink
Style cleanup for #347
Browse files Browse the repository at this point in the history
  • Loading branch information
almossawi committed Apr 8, 2015
1 parent d735a71 commit a737983
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 46 deletions.
40 changes: 17 additions & 23 deletions dist/metricsgraphics.js
Expand Up @@ -1260,9 +1260,9 @@
var max_x;

args.processed = {};
var all_data=[];
for (var i=0; i<args.data.length; i++) {
for (var j=0; j<args.data[i].length; j++) {
var all_data = [];
for (var i = 0; i < args.data.length; i++) {
for (var j = 0; j < args.data[i].length; j++) {
all_data.push(args.data[i][j]);
}
}
Expand Down Expand Up @@ -1790,20 +1790,14 @@

//do we have a time_series?

function is_time_series(args){
function is_time_series(args) {
var flat_data = [];
var first_elem = mg_flatten_array(args.data)[0];
return first_elem[args.x_accessor] instanceof Date;
}

args.time_series = is_time_series(args);

// if (args.data[0][0][args.x_accessor] instanceof Date) {
// args.time_series = true;
// } else {
// args.time_series = false;
// }

var svg_width = args.width;
var svg_height = args.height;

Expand Down Expand Up @@ -4246,30 +4240,30 @@
return this;
};

function is_array(thing){
function is_array(thing) {
return Object.prototype.toString.call(thing) === '[object Array]';
}

function is_empty_array(thing){
function is_empty_array(thing) {
return is_array(thing) && thing.length==0;
}

function is_object(thing){
function is_object(thing) {
return Object.prototype.toString.call(thing) === '[object Object]';
}

function is_array_of_arrays(data){
function is_array_of_arrays(data) {
var all_elements = data.map(function(d){return is_array(d)===true && d.length>0});
return d3.sum(all_elements) === data.length;
}

function is_array_of_objects(data){
function is_array_of_objects(data) {
// is every element of data an object?
var all_elements = data.map(function(d){return is_object(d)===true});
return d3.sum(all_elements) === data.length;
}

function is_array_of_objects_or_empty(data){
function is_array_of_objects_or_empty(data) {
return is_empty_array(data) || is_array_of_objects(data);
}

Expand All @@ -4284,12 +4278,12 @@

var _is_nested_array = is_array_of_arrays(args.data);

args.array_of_objects=false;
args.array_of_arrays=false;
args.nested_array_of_arrays=false;
args.nested_array_of_objects=false;
args.array_of_objects = false;
args.array_of_arrays = false;
args.nested_array_of_arrays = false;
args.nested_array_of_objects = false;

if (_is_nested_array){
if (_is_nested_array) {
args.nested_array_of_objects = args.data.map(function(d){
return is_array_of_objects_or_empty(d);
}); // Case #2
Expand Down Expand Up @@ -4345,7 +4339,7 @@
function process_line(args) {
'use strict';
//do we have a time-series?
var is_time_series = d3.sum(args.data.map(function(series){
var is_time_series = d3.sum(args.data.map(function(series) {
return series.length > 0 && series[0][args.x_accessor] instanceof Date;
})) > 0;

Expand Down Expand Up @@ -4898,7 +4892,7 @@
return d3.select(selector_or_node).select('svg');
}

function mg_flatten_array(arr){
function mg_flatten_array(arr) {
var flat_data = [];
return flat_data.concat.apply(flat_data, arr);
}
Expand Down
8 changes: 1 addition & 7 deletions src/js/common/init.js
Expand Up @@ -26,20 +26,14 @@ function init(args) {

//do we have a time_series?

function is_time_series(args){
function is_time_series(args) {
var flat_data = [];
var first_elem = mg_flatten_array(args.data)[0];
return first_elem[args.x_accessor] instanceof Date;
}

args.time_series = is_time_series(args);

// if (args.data[0][0][args.x_accessor] instanceof Date) {
// args.time_series = true;
// } else {
// args.time_series = false;
// }

var svg_width = args.width;
var svg_height = args.height;

Expand Down
6 changes: 3 additions & 3 deletions src/js/common/x_axis.js
Expand Up @@ -48,9 +48,9 @@ function x_axis(args) {
var max_x;

args.processed = {};
var all_data=[];
for (var i=0; i<args.data.length; i++) {
for (var j=0; j<args.data[i].length; j++) {
var all_data = [];
for (var i = 0; i < args.data.length; i++) {
for (var j = 0; j < args.data[i].length; j++) {
all_data.push(args.data[i][j]);
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/js/misc/process.js
@@ -1,27 +1,27 @@
function is_array(thing){
function is_array(thing) {
return Object.prototype.toString.call(thing) === '[object Array]';
}

function is_empty_array(thing){
function is_empty_array(thing) {
return is_array(thing) && thing.length==0;
}

function is_object(thing){
function is_object(thing) {
return Object.prototype.toString.call(thing) === '[object Object]';
}

function is_array_of_arrays(data){
function is_array_of_arrays(data) {
var all_elements = data.map(function(d){return is_array(d)===true && d.length>0});
return d3.sum(all_elements) === data.length;
}

function is_array_of_objects(data){
function is_array_of_objects(data) {
// is every element of data an object?
var all_elements = data.map(function(d){return is_object(d)===true});
return d3.sum(all_elements) === data.length;
}

function is_array_of_objects_or_empty(data){
function is_array_of_objects_or_empty(data) {
return is_empty_array(data) || is_array_of_objects(data);
}

Expand All @@ -36,12 +36,12 @@ function raw_data_transformation(args) {

var _is_nested_array = is_array_of_arrays(args.data);

args.array_of_objects=false;
args.array_of_arrays=false;
args.nested_array_of_arrays=false;
args.nested_array_of_objects=false;
args.array_of_objects = false;
args.array_of_arrays = false;
args.nested_array_of_arrays = false;
args.nested_array_of_objects = false;

if (_is_nested_array){
if (_is_nested_array) {
args.nested_array_of_objects = args.data.map(function(d){
return is_array_of_objects_or_empty(d);
}); // Case #2
Expand Down Expand Up @@ -97,7 +97,7 @@ function raw_data_transformation(args) {
function process_line(args) {
'use strict';
//do we have a time-series?
var is_time_series = d3.sum(args.data.map(function(series){
var is_time_series = d3.sum(args.data.map(function(series) {
return series.length > 0 && series[0][args.x_accessor] instanceof Date;
})) > 0;

Expand Down
2 changes: 1 addition & 1 deletion src/js/misc/utility.js
Expand Up @@ -26,7 +26,7 @@ function mg_get_svg_child_of(selector_or_node) {
return d3.select(selector_or_node).select('svg');
}

function mg_flatten_array(arr){
function mg_flatten_array(arr) {
var flat_data = [];
return flat_data.concat.apply(flat_data, arr);
}
Expand Down

0 comments on commit a737983

Please sign in to comment.