Skip to content

Commit

Permalink
release 0.2.29
Browse files Browse the repository at this point in the history
  • Loading branch information
khmylov committed Dec 24, 2014
1 parent ca3fd15 commit db04f4d
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 17 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tauCharts",
"version": "0.2.28",
"version": "0.2.29",
"homepage": "https://github.com/TargetProcess/tauCharts",
"description": "Simple charts library based on d3",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion build/plugins/tauCharts.legend.min.js

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

9 changes: 5 additions & 4 deletions build/plugins/tauCharts.tooltip.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,27 @@
max-width: calc(100% - 26px);
}
.graphical-report__tooltip__exclude {
border-right: 1px solid #dde2e7;
color: #65717f;
color: rgba(101, 113, 127, 0.8);
cursor: pointer;
min-height: 86px;
width: 26px;
position: relative;
box-shadow: inset 2px 0 2px -2px rgba(0, 0, 0, 0.2);
}
.graphical-report__tooltip__exclude__wrap {
line-height: 26px;
padding: 0 15px;
transform: rotate(-90deg) translate(-50%, 0);
transform: rotate(-90deg);
transform-origin: 0 0 ;
height: 100%;
white-space: nowrap;
position: absolute;
top: 50%;
top: 100%;
left: 0;
box-sizing: border-box;
}
.graphical-report__tooltip__exclude:hover {
color: #65717f;
background: linear-gradient(to right, rgba(235, 238, 241, 0.9) 0%, rgba(255, 255, 255, 0) 100%);
}
.graphical-report__tooltip__exclude .tau-icon-close-gray {
Expand Down
9 changes: 7 additions & 2 deletions build/plugins/tauCharts.tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
init: function (chart) {
this._chart = chart;
this._dataFields = settings.fields;
_.extend(this, _.omit(settings, 'fields'));
this._getDataFields = settings.getFields;
_.extend(this, _.omit(settings, 'fields', 'getFields'));
this._timeoutHideId = null;
this._dataWithCoords = {};
this._unitMeta = {};
Expand Down Expand Up @@ -118,7 +119,10 @@
});
}, this).join('');
},
onRender: function () {
onRender: function (chart) {
if (_.isFunction(this._getDataFields)) {
this._dataFields = this._getDataFields(chart);
}
this._hide();
},
_exclude: function () {
Expand Down Expand Up @@ -159,6 +163,7 @@
if (this._dataFields) {
return this._dataFields;
}

var fields = [unit.size && unit.size.scaleDim, unit.color && unit.color.scaleDim];
var x = [];
var y = [];
Expand Down
2 changes: 1 addition & 1 deletion build/plugins/tauCharts.tooltip.min.css

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

Loading

0 comments on commit db04f4d

Please sign in to comment.