Skip to content

Commit a11c571

Browse files
add dc.js.map and update a couple deps
1 parent af788e5 commit a11c571

File tree

10 files changed

+162
-154
lines changed

10 files changed

+162
-154
lines changed

Gruntfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ module.exports = function (grunt) {
1010
pkg: grunt.file.readJSON('package.json'),
1111

1212
concat: {
13+
options: {
14+
process: true,
15+
sourceMap: true
16+
},
1317
js: {
1418
src: jsFiles,
1519
dest: output.js
@@ -20,7 +24,7 @@ module.exports = function (grunt) {
2024
options: {
2125
mangle: true,
2226
compress: true,
23-
sourceMap: output.map
27+
sourceMap: true
2428
},
2529
src: output.js,
2630
dest: output.jsmin

dc.js

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dc.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dc.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dc",
33
"filename": "dc.min.js",
4-
"version": "1.7.3",
4+
"version": "1.7.4",
55
"license": "Apache-2.0",
66
"copyright": "2014",
77
"description": "A multi-dimensional charting library built to work natively with crossfilter and rendered using d3.js ",
@@ -32,10 +32,10 @@
3232
"devDependencies": {
3333
"emu": "~0.0.2",
3434
"grunt": "~0.4.1",
35-
"grunt-contrib-concat": "~0.3.0",
35+
"grunt-contrib-concat": "~0.5.0",
3636
"grunt-contrib-copy": "~0.4.1",
3737
"grunt-contrib-jshint": "~0.6.3",
38-
"grunt-contrib-uglify": "~0.2.2",
38+
"grunt-contrib-uglify": "~0.9.1",
3939
"grunt-gh-pages": "~0.7.1",
4040
"grunt-markdown": "https://github.com/willkan/grunt-markdown/tarball/master",
4141
"grunt-sed": "~0.1.1",

web/docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
</style>
113113
</head>
114114
<body>
115-
<h4 id="version-1-7-3">Version 1.7.3</h4>
115+
<h4 id="version-1-7-4">Version 1.7.4</h4>
116116
<p>The entire dc.js library is scoped under <strong>dc</strong> name space. It does not introduce anything else into the global
117117
name space.</p>
118118
<ul>

web/js/crossfilter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(function(exports){
2-
crossfilter.version = "1.3.11";
2+
crossfilter.version = "1.3.12";
33
function crossfilter_identity(d) {
44
return d;
55
}
@@ -631,7 +631,7 @@ function crossfilter() {
631631
// Incorporate any existing data into this dimension, and make sure that the
632632
// filter bitset is wide enough to handle the new dimension.
633633
m |= one;
634-
if (M >= 32 ? !one : m & (1 << M) - 1) {
634+
if (M >= 32 ? !one : m & -(1 << M)) {
635635
filters = crossfilter_arrayWiden(filters, M <<= 1);
636636
}
637637
preAdd(data, 0, n);

0 commit comments

Comments
 (0)