Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pfafman #1133

Closed
wants to merge 4 commits into from
Closed

Pfafman #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6a9a1d
switch to crossfilter2
pfafman Apr 30, 2016
b5845ec
crossfilter deps
pfafman Apr 30, 2016
3638c00
crossfilter deps
pfafman Apr 30, 2016
afc340d
crossfilter2 in footer
pfafman May 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dc.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"url": "https://github.com/dc-js/dc.js.git"
},
"dependencies": {
"crossfilter2": "1.3.x",
"crossfilter2": "1.4.0-alpha.5",
"d3": "3.x"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ return dc;}
define(["d3", "crossfilter"], _dc);
} else if(typeof module === "object" && module.exports) {
var _d3 = require('d3');
var _crossfilter = require('crossfilter');
var _crossfilter = require('crossfilter2');
// When using npm + browserify, 'crossfilter' is a function,
// since package.json specifies index.js as main function, and it
// does special handling. When using bower + browserify,
Expand Down
2 changes: 1 addition & 1 deletion web/js/dc.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.