Skip to content

Commit 6573a88

Browse files
committed
Increment dependency versions, fix package.json dependency version issue, and rebuild artifacts
1 parent b797982 commit 6573a88

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"test"
1818
],
1919
"dependencies": {
20-
"crossfilter2": "1.4.0-alpha.05"
20+
"crossfilter2": "1.4.0-alpha.06"
2121
}
2222
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "reductio",
3-
"version": "0.6.2",
3+
"version": "0.6.3",
44
"description": "Reductio: Crossfilter groupings",
55
"main": "src/reductio.js",
66
"directories": {
77
"test": "test"
88
},
99
"dependencies": {
10-
"crossfilter2": "^1.4.0-alpha.05"
10+
"crossfilter2": "^1.4.0-alpha.6"
1111
},
1212
"devDependencies": {
1313
"browserify": "^8.1.1",

reductio.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var reductio_build = require('./build.js');
44
var reductio_accessors = require('./accessors.js');
55
var reductio_parameters = require('./parameters.js');
66
var reductio_postprocess = require('./postprocess');
7-
var crossfilter = (typeof window !== "undefined" ? window.crossfilter : typeof global !== "undefined" ? global.crossfilter : null);
7+
var crossfilter = (typeof window !== "undefined" ? window['crossfilter'] : typeof global !== "undefined" ? global['crossfilter'] : null);
88

99
function reductio() {
1010
var parameters = reductio_parameters();
@@ -176,7 +176,7 @@ function accessor_build(obj, p) {
176176

177177
// We can take an accessor function, a boolean, or a string
178178
if( typeof value === 'function' ) {
179-
if(p.sum) console.warn('SUM aggregation is being overwritten by AVG aggregation');
179+
if(p.sum && p.sum !== value) console.warn('SUM aggregation is being overwritten by AVG aggregation');
180180
p.sum = value;
181181
p.avg = true;
182182
p.count = 'count';
@@ -216,7 +216,7 @@ function accessor_build(obj, p) {
216216
value = accessorifyNumeric(value);
217217

218218
if(typeof value === 'function') {
219-
if(p.valueList) console.warn('VALUELIST accessor is being overwritten by median aggregation');
219+
if(p.valueList && p.valueList !== value) console.warn('VALUELIST accessor is being overwritten by median aggregation');
220220
p.valueList = value;
221221
}
222222
p.median = value;
@@ -229,7 +229,7 @@ function accessor_build(obj, p) {
229229
value = accessorifyNumeric(value);
230230

231231
if(typeof value === 'function') {
232-
if(p.valueList) console.warn('VALUELIST accessor is being overwritten by median aggregation');
232+
if(p.valueList && p.valueList !== value) console.warn('VALUELIST accessor is being overwritten by min aggregation');
233233
p.valueList = value;
234234
}
235235
p.min = value;
@@ -242,7 +242,7 @@ function accessor_build(obj, p) {
242242
value = accessorifyNumeric(value);
243243

244244
if(typeof value === 'function') {
245-
if(p.valueList) console.warn('VALUELIST accessor is being overwritten by median aggregation');
245+
if(p.valueList && p.valueList !== value) console.warn('VALUELIST accessor is being overwritten by max aggregation');
246246
p.valueList = value;
247247
}
248248
p.max = value;
@@ -255,7 +255,7 @@ function accessor_build(obj, p) {
255255
value = accessorify(value);
256256

257257
if( typeof value === 'function' ) {
258-
if(p.sum) console.warn('EXCEPTION accessor is being overwritten by exception count aggregation');
258+
if(p.exceptionAccessor && p.exceptionAccessor !== value) console.warn('EXCEPTION accessor is being overwritten by exception count aggregation');
259259
p.exceptionAccessor = value;
260260
p.exceptionCount = true;
261261
} else {
@@ -875,7 +875,7 @@ module.exports = reductio_filter;
875875

876876
},{}],14:[function(require,module,exports){
877877
(function (global){
878-
var crossfilter = (typeof window !== "undefined" ? window.crossfilter : typeof global !== "undefined" ? global.crossfilter : null);
878+
var crossfilter = (typeof window !== "undefined" ? window['crossfilter'] : typeof global !== "undefined" ? global['crossfilter'] : null);
879879

880880
var reductio_histogram = {
881881
add: function (a, prior, path) {
@@ -1045,7 +1045,7 @@ var reductio_min = {
10451045
module.exports = reductio_min;
10461046
},{}],18:[function(require,module,exports){
10471047
(function (global){
1048-
var crossfilter = (typeof window !== "undefined" ? window.crossfilter : typeof global !== "undefined" ? global.crossfilter : null);
1048+
var crossfilter = (typeof window !== "undefined" ? window['crossfilter'] : typeof global !== "undefined" ? global['crossfilter'] : null);
10491049

10501050
var reductio_nest = {
10511051
add: function (keyAccessors, prior, path) {
@@ -1306,7 +1306,7 @@ var reductio_sum = {
13061306
module.exports = reductio_sum;
13071307
},{}],26:[function(require,module,exports){
13081308
(function (global){
1309-
var crossfilter = (typeof window !== "undefined" ? window.crossfilter : typeof global !== "undefined" ? global.crossfilter : null);
1309+
var crossfilter = (typeof window !== "undefined" ? window['crossfilter'] : typeof global !== "undefined" ? global['crossfilter'] : null);
13101310

13111311
var reductio_value_count = {
13121312
add: function (a, prior, path) {
@@ -1351,7 +1351,7 @@ module.exports = reductio_value_count;
13511351
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
13521352
},{}],27:[function(require,module,exports){
13531353
(function (global){
1354-
var crossfilter = (typeof window !== "undefined" ? window.crossfilter : typeof global !== "undefined" ? global.crossfilter : null);
1354+
var crossfilter = (typeof window !== "undefined" ? window['crossfilter'] : typeof global !== "undefined" ? global['crossfilter'] : null);
13551355

13561356
var reductio_value_list = {
13571357
add: function (a, prior, path) {

0 commit comments

Comments
 (0)