Update Rickshaw from 1.5.0 to 1.5.1

Change-Id: I88acaab7a0cfff71b9fd96d5a6c8a5fcaae1b8d1
Closes-Bug: #1531313
This commit is contained in:
Rajat Vig 2016-01-05 14:03:17 -08:00
parent d4b60cf4d6
commit 7be3a603cf
3 changed files with 242 additions and 206 deletions

View File

@ -11,7 +11,7 @@ NAME = __name__.split('.')[-1] # package name (e.g. 'foo' or 'foo_bar')
# please use a all-lowercase valid python # please use a all-lowercase valid python
# package name # package name
VERSION = '1.5.0' # version of the packaged files, please use the upstream VERSION = '1.5.1' # version of the packaged files, please use the upstream
# version number # version number
BUILD = '0' # our package build number, so we can release new builds BUILD = '0' # our package build number, so we can release new builds
# with fixes for xstatic stuff. # with fixes for xstatic stuff.

View File

@ -1,133 +1,165 @@
.rickshaw_graph .detail { .rickshaw_graph .detail {
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;
top: 0; top: 0;
z-index: 2; z-index: 2;
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
bottom: 0; bottom: 0;
width: 1px; width: 1px;
transition: opacity 0.25s linear; transition: opacity 0.25s linear;
-moz-transition: opacity 0.25s linear; -moz-transition: opacity 0.25s linear;
-o-transition: opacity 0.25s linear; -o-transition: opacity 0.25s linear;
-webkit-transition: opacity 0.25s linear; -webkit-transition: opacity 0.25s linear;
} }
.rickshaw_graph .detail.inactive { .rickshaw_graph .detail.inactive {
opacity: 0; opacity: 0;
} }
.rickshaw_graph .detail .item.active { .rickshaw_graph .detail .item.active {
opacity: 1; opacity: 1;
} }
.rickshaw_graph .detail .x_label { .rickshaw_graph .detail .x_label {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
border-radius: 3px; border-radius: 3px;
padding: 6px; padding: 6px;
opacity: 0.5; opacity: 0.5;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
font-size: 12px; font-size: 12px;
position: absolute; position: absolute;
background: white; background: white;
white-space: nowrap; white-space: nowrap;
}
.rickshaw_graph .detail .x_label.left {
left: 0;
}
.rickshaw_graph .detail .x_label.right {
right: 0;
} }
.rickshaw_graph .detail .item { .rickshaw_graph .detail .item {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
border-radius: 3px; border-radius: 3px;
padding: 0.25em; padding: 0.25em;
font-size: 12px; font-size: 12px;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
opacity: 0; opacity: 0;
background: rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.4);
color: white; color: white;
border: 1px solid rgba(0, 0, 0, 0.4); border: 1px solid rgba(0, 0, 0, 0.4);
margin-left: 1em; margin-left: 1em;
margin-top: -1em; margin-right: 1em;
white-space: nowrap; margin-top: -1em;
white-space: nowrap;
}
.rickshaw_graph .detail .item.left {
left: 0;
}
.rickshaw_graph .detail .item.right {
right: 0;
} }
.rickshaw_graph .detail .item.active { .rickshaw_graph .detail .item.active {
opacity: 1; opacity: 1;
background: rgba(0, 0, 0, 0.8); background: rgba(0, 0, 0, 0.8);
} }
.rickshaw_graph .detail .item:before { .rickshaw_graph .detail .item:after {
content: "\25c2"; position: absolute;
position: absolute; display: block;
left: -0.5em; width: 0;
color: rgba(0, 0, 0, 0.7); height: 0;
width: 0;
content: "";
border: 5px solid transparent;
}
.rickshaw_graph .detail .item.left:after {
top: 1em;
left: -5px;
margin-top: -5px;
border-right-color: rgba(0, 0, 0, 0.8);
border-left-width: 0;
}
.rickshaw_graph .detail .item.right:after {
top: 1em;
right: -5px;
margin-top: -5px;
border-left-color: rgba(0, 0, 0, 0.8);
border-right-width: 0;
} }
.rickshaw_graph .detail .dot { .rickshaw_graph .detail .dot {
width: 4px; width: 4px;
height: 4px; height: 4px;
margin-left: -4px; margin-left: -3px;
margin-top: -3px; margin-top: -3.5px;
border-radius: 5px; border-radius: 5px;
position: absolute; position: absolute;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.6); box-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
background: white; box-sizing: content-box;
border-width: 2px; -moz-box-sizing: content-box;
border-style: solid; background: white;
display: none; border-width: 2px;
background-clip: padding-box; border-style: solid;
display: none;
background-clip: padding-box;
} }
.rickshaw_graph .detail .dot.active { .rickshaw_graph .detail .dot.active {
display: block; display: block;
} }
/* graph */ /* graph */
.rickshaw_graph { .rickshaw_graph {
position: relative; position: relative;
} }
.rickshaw_graph svg { .rickshaw_graph svg {
display: block; display: block;
overflow: hidden; overflow: hidden;
} }
/* ticks */ /* ticks */
.rickshaw_graph .x_tick { .rickshaw_graph .x_tick {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 0px; width: 0px;
border-left: 1px dotted rgba(0, 0, 0, 0.2); border-left: 1px dotted rgba(0, 0, 0, 0.2);
pointer-events: none; pointer-events: none;
} }
.rickshaw_graph .x_tick .title { .rickshaw_graph .x_tick .title {
position: absolute; position: absolute;
font-size: 12px; font-size: 12px;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
opacity: 0.5; opacity: 0.5;
white-space: nowrap; white-space: nowrap;
margin-left: 3px; margin-left: 3px;
bottom: 1px; bottom: 1px;
} }
/* annotations */ /* annotations */
.rickshaw_annotation_timeline { .rickshaw_annotation_timeline {
height: 1px; height: 1px;
border-top: 1px solid #e0e0e0; border-top: 1px solid #e0e0e0;
margin-top: 10px; margin-top: 10px;
position: relative; position: relative;
} }
.rickshaw_annotation_timeline .annotation { .rickshaw_annotation_timeline .annotation {
position: absolute; position: absolute;
height: 6px; height: 6px;
width: 6px; width: 6px;
margin-left: -2px; margin-left: -2px;
top: -3px; top: -3px;
border-radius: 5px; border-radius: 5px;
background-color: rgba(0, 0, 0, 0.25); background-color: rgba(0, 0, 0, 0.25);
} }
.rickshaw_graph .annotation_line { .rickshaw_graph .annotation_line {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: -6px; bottom: -6px;
width: 0px; width: 0px;
border-left: 2px solid rgba(0, 0, 0, 0.3); border-left: 2px solid rgba(0, 0, 0, 0.3);
display: none; display: none;
} }
.rickshaw_graph .annotation_line.active { .rickshaw_graph .annotation_line.active {
display: block; display: block;
} }
.rickshaw_graph .annotation_range { .rickshaw_graph .annotation_range {
@ -145,176 +177,179 @@
} }
.rickshaw_annotation_timeline .annotation .content { .rickshaw_annotation_timeline .annotation .content {
background: white; background: white;
color: black; color: black;
opacity: 0.9; opacity: 0.9;
padding: 5px 5px; padding: 5px 5px;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.8); box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
border-radius: 3px; border-radius: 3px;
position: relative; position: relative;
z-index: 20; z-index: 20;
font-size: 12px; font-size: 12px;
padding: 6px 8px 8px; padding: 6px 8px 8px;
top: 18px; top: 18px;
left: -11px; left: -11px;
width: 160px; width: 160px;
display: none; display: none;
cursor: pointer; cursor: pointer;
} }
.rickshaw_annotation_timeline .annotation .content:before { .rickshaw_annotation_timeline .annotation .content:before {
content: "\25b2"; content: "\25b2";
position: absolute; position: absolute;
top: -11px; top: -11px;
color: white; color: white;
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8); text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8);
} }
.rickshaw_annotation_timeline .annotation.active, .rickshaw_annotation_timeline .annotation.active,
.rickshaw_annotation_timeline .annotation:hover { .rickshaw_annotation_timeline .annotation:hover {
background-color: rgba(0, 0, 0, 0.8); background-color: rgba(0, 0, 0, 0.8);
cursor: none; cursor: none;
} }
.rickshaw_annotation_timeline .annotation .content:hover { .rickshaw_annotation_timeline .annotation .content:hover {
z-index: 50; z-index: 50;
} }
.rickshaw_annotation_timeline .annotation.active .content { .rickshaw_annotation_timeline .annotation.active .content {
display: block; display: block;
} }
.rickshaw_annotation_timeline .annotation:hover .content { .rickshaw_annotation_timeline .annotation:hover .content {
display: block; display: block;
z-index: 50; z-index: 50;
} }
.rickshaw_graph .y_axis, .rickshaw_graph .y_axis,
.rickshaw_graph .x_axis_d3 { .rickshaw_graph .x_axis_d3 {
fill: none; fill: none;
} }
.rickshaw_graph .y_ticks .tick, .rickshaw_graph .y_ticks .tick line,
.rickshaw_graph .x_ticks_d3 .tick { .rickshaw_graph .x_ticks_d3 .tick {
stroke: rgba(0, 0, 0, 0.16); stroke: rgba(0, 0, 0, 0.16);
stroke-width: 2px; stroke-width: 2px;
shape-rendering: crisp-edges; shape-rendering: crisp-edges;
pointer-events: none; pointer-events: none;
} }
.rickshaw_graph .y_grid .tick, .rickshaw_graph .y_grid .tick,
.rickshaw_graph .x_grid_d3 .tick { .rickshaw_graph .x_grid_d3 .tick {
z-index: -1; z-index: -1;
stroke: rgba(0, 0, 0, 0.20); stroke: rgba(0, 0, 0, 0.20);
stroke-width: 1px; stroke-width: 1px;
stroke-dasharray: 1 1; stroke-dasharray: 1 1;
}
.rickshaw_graph .y_grid .tick[data-y-value="0"] {
stroke-dasharray: 1 0;
} }
.rickshaw_graph .y_grid path, .rickshaw_graph .y_grid path,
.rickshaw_graph .x_grid_d3 path { .rickshaw_graph .x_grid_d3 path {
fill: none; fill: none;
stroke: none; stroke: none;
} }
.rickshaw_graph .y_ticks path, .rickshaw_graph .y_ticks path,
.rickshaw_graph .x_ticks_d3 path { .rickshaw_graph .x_ticks_d3 path {
fill: none; fill: none;
stroke: #808080; stroke: #808080;
} }
.rickshaw_graph .y_ticks text, .rickshaw_graph .y_ticks text,
.rickshaw_graph .x_ticks_d3 text { .rickshaw_graph .x_ticks_d3 text {
opacity: 0.5; opacity: 0.5;
font-size: 12px; font-size: 12px;
pointer-events: none; pointer-events: none;
} }
.rickshaw_graph .x_tick.glow .title, .rickshaw_graph .x_tick.glow .title,
.rickshaw_graph .y_ticks.glow text { .rickshaw_graph .y_ticks.glow text {
fill: black; fill: black;
color: black; color: black;
text-shadow: text-shadow:
-1px 1px 0 rgba(255, 255, 255, 0.1), -1px 1px 0 rgba(255, 255, 255, 0.1),
1px -1px 0 rgba(255, 255, 255, 0.1), 1px -1px 0 rgba(255, 255, 255, 0.1),
1px 1px 0 rgba(255, 255, 255, 0.1), 1px 1px 0 rgba(255, 255, 255, 0.1),
0px 1px 0 rgba(255, 255, 255, 0.1), 0px 1px 0 rgba(255, 255, 255, 0.1),
0px -1px 0 rgba(255, 255, 255, 0.1), 0px -1px 0 rgba(255, 255, 255, 0.1),
1px 0px 0 rgba(255, 255, 255, 0.1), 1px 0px 0 rgba(255, 255, 255, 0.1),
-1px 0px 0 rgba(255, 255, 255, 0.1), -1px 0px 0 rgba(255, 255, 255, 0.1),
-1px -1px 0 rgba(255, 255, 255, 0.1); -1px -1px 0 rgba(255, 255, 255, 0.1);
} }
.rickshaw_graph .x_tick.inverse .title, .rickshaw_graph .x_tick.inverse .title,
.rickshaw_graph .y_ticks.inverse text { .rickshaw_graph .y_ticks.inverse text {
fill: white; fill: white;
color: white; color: white;
text-shadow: text-shadow:
-1px 1px 0 rgba(0, 0, 0, 0.8), -1px 1px 0 rgba(0, 0, 0, 0.8),
1px -1px 0 rgba(0, 0, 0, 0.8), 1px -1px 0 rgba(0, 0, 0, 0.8),
1px 1px 0 rgba(0, 0, 0, 0.8), 1px 1px 0 rgba(0, 0, 0, 0.8),
0px 1px 0 rgba(0, 0, 0, 0.8), 0px 1px 0 rgba(0, 0, 0, 0.8),
0px -1px 0 rgba(0, 0, 0, 0.8), 0px -1px 0 rgba(0, 0, 0, 0.8),
1px 0px 0 rgba(0, 0, 0, 0.8), 1px 0px 0 rgba(0, 0, 0, 0.8),
-1px 0px 0 rgba(0, 0, 0, 0.8), -1px 0px 0 rgba(0, 0, 0, 0.8),
-1px -1px 0 rgba(0, 0, 0, 0.8); -1px -1px 0 rgba(0, 0, 0, 0.8);
} }
.rickshaw_legend { .rickshaw_legend {
font-family: Arial; font-family: Arial;
font-size: 12px; font-size: 12px;
color: white; color: white;
background: #404040; background: #404040;
display: inline-block; display: inline-block;
padding: 12px 5px; padding: 12px 5px;
border-radius: 2px; border-radius: 2px;
position: relative; position: relative;
} }
.rickshaw_legend:hover { .rickshaw_legend:hover {
z-index: 10; z-index: 10;
} }
.rickshaw_legend .swatch { .rickshaw_legend .swatch {
width: 10px; width: 10px;
height: 10px; height: 10px;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
} }
.rickshaw_legend .line { .rickshaw_legend .line {
clear: both; clear: both;
line-height: 140%; line-height: 140%;
padding-right: 15px; padding-right: 15px;
} }
.rickshaw_legend .line .swatch { .rickshaw_legend .line .swatch {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
border-radius: 2px; border-radius: 2px;
} }
.rickshaw_legend .label { .rickshaw_legend .label {
margin: 0; margin: 0;
white-space: nowrap; white-space: nowrap;
display: inline; display: inline;
font-size: inherit; font-size: inherit;
background-color: transparent; background-color: transparent;
color: inherit; color: inherit;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
padding: 0px; padding: 0px;
text-shadow: none; text-shadow: none;
} }
.rickshaw_legend .action:hover { .rickshaw_legend .action:hover {
opacity: 0.6; opacity: 0.6;
} }
.rickshaw_legend .action { .rickshaw_legend .action {
margin-right: 0.2em; margin-right: 0.2em;
font-size: 10px; font-size: 10px;
opacity: 0.2; opacity: 0.2;
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
} }
.rickshaw_legend .line.disabled { .rickshaw_legend .line.disabled {
opacity: 0.4; opacity: 0.4;
} }
.rickshaw_legend ul { .rickshaw_legend ul {
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
margin: 2px; margin: 2px;
cursor: pointer; cursor: pointer;
} }
.rickshaw_legend li { .rickshaw_legend li {
padding: 0 0 0 2px; padding: 0 0 0 2px;
min-width: 80px; min-width: 80px;
white-space: nowrap; white-space: nowrap;
} }
.rickshaw_legend li:hover { .rickshaw_legend li:hover {
background: rgba(255, 255, 255, 0.08); background: rgba(255, 255, 255, 0.08);
border-radius: 3px; border-radius: 3px;
} }
.rickshaw_legend li:active { .rickshaw_legend li:active {
background: rgba(255, 255, 255, 0.2); background: rgba(255, 255, 255, 0.2);
border-radius: 3px; border-radius: 3px;
} }

View File

@ -1931,6 +1931,8 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
line.element.classList.add('disabled'); line.element.classList.add('disabled');
} }
self.graph.update();
}.bind(this); }.bind(this);
var label = line.element.getElementsByTagName('span')[0]; var label = line.element.getElementsByTagName('span')[0];
@ -1976,6 +1978,8 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
} }
self.graph.update();
}; };
}; };
@ -2017,12 +2021,10 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
} }
s.disabled = true; s.disabled = true;
self.graph.update();
}; };
s.enable = function() { s.enable = function() {
s.disabled = false; s.disabled = false;
self.graph.update();
}; };
} ); } );
}; };
@ -3759,7 +3761,6 @@ Rickshaw.Graph.Smoother = Rickshaw.Class.create({
max: 100, max: 100,
slide: function( event, ui ) { slide: function( event, ui ) {
self.setScale(ui.value); self.setScale(ui.value);
self.graph.update();
} }
} ); } );
} ); } );