Skip to content

Commit

Permalink
Fixing grunt dependency to 0.4.2 + JSDoc in builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
iros committed Jun 24, 2014
1 parent 0baa5a1 commit 2961793
Show file tree
Hide file tree
Showing 15 changed files with 6,239 additions and 2,366 deletions.
2 changes: 1 addition & 1 deletion dist/LASTBUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2013/03/13 11:18
2014/06/24 11:12
1,701 changes: 1,238 additions & 463 deletions dist/miso.ds.0.4.1.js

Large diffs are not rendered by default.

1,705 changes: 1,240 additions & 465 deletions dist/miso.ds.0.4.1.m.js

Large diffs are not rendered by default.

1,705 changes: 1,240 additions & 465 deletions dist/miso.ds.deps.0.4.1.js

Large diffs are not rendered by default.

1,705 changes: 1,240 additions & 465 deletions dist/miso.ds.deps.ie.0.4.1.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/miso.ds.deps.ie.min.0.4.1.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/miso.ds.deps.min.0.4.1.js

Large diffs are not rendered by default.

Binary file modified dist/miso.ds.dev.0.4.1.zip
Binary file not shown.
6 changes: 3 additions & 3 deletions dist/miso.ds.min.0.4.1.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/miso.ds.min.0.4.1.m.js

Large diffs are not rendered by default.

1,701 changes: 1,238 additions & 463 deletions dist/node/miso.ds.deps.0.4.1.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"version" : "0.4.1",
"homepage" : "http://github.com/misoproject/dataset",
"authors" : "Alex Graul, Irene Ros",

"bugs" : {
"url" : "http://github.com:misoproject/Dataset/issues"
},

"licenses" : [
"licenses" : [
{
"type" : "MIT",
"url" : "http://github.com:misoproject/dataset/blob/master/LICENSE-MIT"
Expand All @@ -35,7 +35,7 @@
},

"devDependencies" : {
"grunt" : "~0.4.0",
"grunt" : "~0.4.2",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.1.2",
"grunt-contrib-watch": "~0.3.0",
Expand Down
4 changes: 2 additions & 2 deletions src/importers/local.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* @augments Miso.Dataset.Importers.Remote
*
* @param {Object} [options]
* @param options.data local object containing your data
* @param {Object} options.data local object containing your data
* @param {Function} options.extract override for Dataset.Importers.prototype.extract
*
* @externalExample {runnable} importers/local
*/
// TODO: Document `options.extract`
Dataset.Importers.Local = function(options) {
options = options || {};

Expand Down
32 changes: 15 additions & 17 deletions src/product.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
Dataset.Product = function(options) {
options = options || {};

// save column name. This will be necessary later
// when we decide whether we need to update the column
// when sync is called.
Expand All @@ -32,7 +32,7 @@
if (_.isArray(options.columns)) {
column = options.columns[0];
}

this.valuetype = column.type;
this.numeric = function() {
return column.toNumeric(this.value);
Expand Down Expand Up @@ -63,7 +63,7 @@
type : function() {
return this.valuetype;
},

//This is a callback method that is responsible for recomputing
//the value based on the column its closed on.
_sync : function(event) {
Expand Down Expand Up @@ -122,8 +122,8 @@
}
}
});
this.subscribe("change", prod._sync, { context : prod });
return prod;
this.subscribe("change", prod._sync, { context : prod });
return prod;

} else {
return producer.call(_self);
Expand Down Expand Up @@ -175,8 +175,7 @@
*
* @returns {Miso.Dataset.Product|Number}
*/
// TODO: Remove unused `options` argument
sum : Dataset.Product.define( function(columns, options) {
sum : Dataset.Product.define( function(columns) {
_.each(columns, function(col) {
if (col.type === Dataset.types.time.name) {
throw new Error("Can't sum up time");
Expand All @@ -193,21 +192,20 @@
*
* @method
*
* @param {String|String[]} column - column name(s) on which the value is
* @param {String|String[]} columns - column name(s) on which the value is
* calculated
*
* @externalExample {runnable} dataview/max
*
* @returns {Miso.Dataset.Product|Number}
*/
// TODO: Remove unused `options` argument
max : Dataset.Product.define( function(columns, options) {
return _.max(_.map(columns, function(c) {
return c._max();
max : Dataset.Product.define( function(columns) {
return _.max(_.map(columns, function(c) {
return c._max();
}));
}),


/**
* If the dataset has `sync` enabled this will return a
* `Miso.Dataset.Product` that can be used to bind events to and access the
Expand All @@ -223,9 +221,9 @@
*
* @returns {Miso.Dataset.Product|Number}
*/
min : Dataset.Product.define( function(columns, options) {
return _.min(_.map(columns, function(c) {
return c._min();
min : Dataset.Product.define( function(columns) {
return _.min(_.map(columns, function(c) {
return c._min();
}));
}),

Expand Down Expand Up @@ -257,7 +255,7 @@

// convert the values to their appropriate numeric value
vals = _.map(vals, function(v) { return Dataset.types[type].numeric(v); });
return _.mean(vals);
return _.mean(vals);
})

});
Expand Down
12 changes: 6 additions & 6 deletions src/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* @param {mixed} value - The value to test
* @param {Object} [options]
* @param {String} [format] - For `time` type only. Describes the format.
* @param {String} [options.format] - For `time` type only. Describes the format.
*
* @externalExample {runnable} type-of
*
Expand All @@ -33,7 +33,7 @@

return chosenType;
};

/**
* Miso types are used to set and manage the data types on columns. These
* sets of functions handle testing what type data is and coercing it into
Expand All @@ -47,7 +47,7 @@
* @externalExample types
*/
Dataset.types = {

mixed :
/**
* @namespace mixed
Expand Down Expand Up @@ -279,7 +279,7 @@
if (value === null || _.isNaN(value)) {
return null;
} else {
return (value) ? 1 : 0;
return (value) ? 1 : 0;
}
}
},
Expand Down Expand Up @@ -415,7 +415,7 @@

// save the string of the regexp, NOT the regexp itself.
// For some reason, this resulted in inconsistant behavior
this._regexpTable[format] = regexp;
this._regexpTable[format] = regexp;
return new RegExp(this._regexpTable[format], 'g');
},

Expand All @@ -442,7 +442,7 @@
// if string, then parse as a time
if (_.isString(v)) {
var format = options.format || this.format;
return moment(v, format);
return moment(v, format);
} else if (_.isNumber(v)) {
return moment(v);
} else {
Expand Down

0 comments on commit 2961793

Please sign in to comment.