🌐 AI搜索 & 代理 主页
Skip to content
This repository was archived by the owner on Oct 21, 2023. It is now read-only.

Commit 5f4a167

Browse files
gordonwoodhullgordonwoodhull
committed
Merge branch 'release/0.0.5'
2 parents d824e2b + 6935b31 commit 5f4a167

14 files changed

+60
-50
lines changed

‎Changelog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 0.0.5
2+
* Correct dependencies (d3 and dc)
3+
14
## 0.0.4
25
* Fix AMD and ES6/Typescript import problems
36

‎dc.datatables.js‎

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

‎dc.datatables.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.

‎dc.datatables.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.datatables.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dc.datatables",
3-
"version": "0.0.4",
3+
"version": "0.0.5",
44
"license": "Apache-2.0",
55
"copyright": "2018",
66
"description": "Datatables integrated with crossfilter and dc.js",

‎src/banner.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
(function() { function _dcdt(dc) {
1+
(function() { function _dcdt(d3, dc) {
22
'use strict';

‎src/footer.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
// Expose d3 and crossfilter, so that clients in browserify
2-
// case can obtain them if they need them.
3-
dc_datatables.crossfilter = crossfilter;
1+
// Expose dc; clients can retrieve d3 & crossfilter from dc if needed
2+
dc_datatables.dc = dc;
43

54
return dc_datatables;}
65
if(typeof define === "function" && define.amd) {
7-
define([], _dcdt);
6+
define(["d3", "dc"], _dcdt);
87
} else if(typeof module === "object" && module.exports) {
8+
var _d3 = require('d3');
99
var _dc = require('dc');
10-
module.exports = _dcdt(_dc);
10+
module.exports = _dcdt(_d3, _dc);
1111
} else {
12-
this.dc_datatables = _dcdt(dc);
12+
this.dc_datatables = _dcdt(d3, dc);
1313
}
1414
}
1515
)();

‎web/css/dc.css‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,6 @@ div.dc-chart {
195195
fill: #fee;
196196
cursor: default; }
197197

198-
.dc-chart circle.dot {
199-
stroke: none; }
200-
201198
.dc-data-count {
202199
float: right;
203200
margin-top: 15px;

‎web/js/dc.datatables.js‎

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

0 commit comments

Comments
 (0)