Skip to content

Commit

Permalink
fixes to striping. bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
Elliot Nahman committed Jun 30, 2017
1 parent 1ae325c commit 0569585
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

v2.1.0
==================
* Include striping component
* Added code to handle striping
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-vis-timeseries",
"version": "2.0.0",
"version": "2.1.0",
"main": [
"px-vis-timeseries.html"
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "px-vis-timeseries",
"author": "General Electric",
"description": "A Px visualization timeseries chart",
"version": "2.0.0",
"version": "2.1.0",
"private": true,
"extName": null,
"repository": {
Expand Down
11 changes: 6 additions & 5 deletions px-vis-timeseries.html
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,17 @@
chart-width="[[width]]"
height="[[_verticalRegisterHeight]]"
margin="[[_chartOrNavMargin(disableNavigator, _internalMargin.*, _internalMarginNav.*)]]"
inert="[[hideRegister]]"
class$="{{_getHideClass(hideRegister)}}"
units="[[units]]"
tooltip-data="[[tooltipData]]"
chart-data="[[chartData]]"
complete-series-config="[[completeSeriesConfig]]"
muted-series={{mutedSeries}}
muted-series="{{mutedSeries}}"
type="{{_registerType}}"
x-axis-type="time"
y-axis-type="[[yAxisType]]">
</px-vis-register>
<!--inert="[[hideRegister]]"-->
<!-- chart + navigator -->
<div id="drawingWrapper" class="flex--col flex__item--no-grow inline--flex">
<px-vis-toolbar
Expand Down Expand Up @@ -1341,9 +1341,9 @@
.on("mouseleave", this._hideStripeHover.bind(this))
//turn off when you leave out the sides
.on("mousemove", function() {
if(Px.d3.event.path[0].classList.contains('overlay')) {
this._hideStripeHover();
}
if(Polymer.dom(Px.d3.event).path[0].classList.contains('overlay')) {
this._hideStripeHover();
}
}.bind(this))
.call(this._stripeBrush.move, [x0, x1]);

Expand Down Expand Up @@ -1431,6 +1431,7 @@
this._deleteStripe();

// mock a extentsDataChange to pass data to the stripe creation fn
if(!this.extentsData) { this.extentsData = {}; }
this.extentsData.eX = [this.x.invert(brushExt[0]), this.x.invert(brushExt[1])];
this._createStripe();
}
Expand Down

0 comments on commit 0569585

Please sign in to comment.