From 7be3a603cfd67ae7022edd75e0a4f77f47cc2787 Mon Sep 17 00:00:00 2001 From: Rajat Vig Date: Tue, 5 Jan 2016 14:03:17 -0800 Subject: [PATCH] Update Rickshaw from 1.5.0 to 1.5.1 Change-Id: I88acaab7a0cfff71b9fd96d5a6c8a5fcaae1b8d1 Closes-Bug: #1531313 --- xstatic/pkg/rickshaw/__init__.py | 2 +- xstatic/pkg/rickshaw/data/rickshaw.css | 439 +++++++++++++------------ xstatic/pkg/rickshaw/data/rickshaw.js | 7 +- 3 files changed, 242 insertions(+), 206 deletions(-) diff --git a/xstatic/pkg/rickshaw/__init__.py b/xstatic/pkg/rickshaw/__init__.py index 22276f9..a70aed1 100644 --- a/xstatic/pkg/rickshaw/__init__.py +++ b/xstatic/pkg/rickshaw/__init__.py @@ -11,7 +11,7 @@ NAME = __name__.split('.')[-1] # package name (e.g. 'foo' or 'foo_bar') # please use a all-lowercase valid python # 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 BUILD = '0' # our package build number, so we can release new builds # with fixes for xstatic stuff. diff --git a/xstatic/pkg/rickshaw/data/rickshaw.css b/xstatic/pkg/rickshaw/data/rickshaw.css index 0502514..8e11946 100644 --- a/xstatic/pkg/rickshaw/data/rickshaw.css +++ b/xstatic/pkg/rickshaw/data/rickshaw.css @@ -1,133 +1,165 @@ .rickshaw_graph .detail { - pointer-events: none; - position: absolute; - top: 0; - z-index: 2; - background: rgba(0, 0, 0, 0.1); - bottom: 0; - width: 1px; - transition: opacity 0.25s linear; - -moz-transition: opacity 0.25s linear; - -o-transition: opacity 0.25s linear; - -webkit-transition: opacity 0.25s linear; + pointer-events: none; + position: absolute; + top: 0; + z-index: 2; + background: rgba(0, 0, 0, 0.1); + bottom: 0; + width: 1px; + transition: opacity 0.25s linear; + -moz-transition: opacity 0.25s linear; + -o-transition: opacity 0.25s linear; + -webkit-transition: opacity 0.25s linear; } .rickshaw_graph .detail.inactive { - opacity: 0; + opacity: 0; } .rickshaw_graph .detail .item.active { - opacity: 1; + opacity: 1; } .rickshaw_graph .detail .x_label { - font-family: Arial, sans-serif; - border-radius: 3px; - padding: 6px; - opacity: 0.5; - border: 1px solid #e0e0e0; - font-size: 12px; - position: absolute; - background: white; - white-space: nowrap; + font-family: Arial, sans-serif; + border-radius: 3px; + padding: 6px; + opacity: 0.5; + border: 1px solid #e0e0e0; + font-size: 12px; + position: absolute; + background: white; + white-space: nowrap; +} +.rickshaw_graph .detail .x_label.left { + left: 0; +} +.rickshaw_graph .detail .x_label.right { + right: 0; } .rickshaw_graph .detail .item { - position: absolute; - z-index: 2; - border-radius: 3px; - padding: 0.25em; - font-size: 12px; - font-family: Arial, sans-serif; - opacity: 0; - background: rgba(0, 0, 0, 0.4); - color: white; - border: 1px solid rgba(0, 0, 0, 0.4); - margin-left: 1em; - margin-top: -1em; - white-space: nowrap; + position: absolute; + z-index: 2; + border-radius: 3px; + padding: 0.25em; + font-size: 12px; + font-family: Arial, sans-serif; + opacity: 0; + background: rgba(0, 0, 0, 0.4); + color: white; + border: 1px solid rgba(0, 0, 0, 0.4); + margin-left: 1em; + margin-right: 1em; + 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 { - opacity: 1; - background: rgba(0, 0, 0, 0.8); + opacity: 1; + background: rgba(0, 0, 0, 0.8); } -.rickshaw_graph .detail .item:before { - content: "\25c2"; - position: absolute; - left: -0.5em; - color: rgba(0, 0, 0, 0.7); - width: 0; +.rickshaw_graph .detail .item:after { + position: absolute; + display: block; + width: 0; + height: 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 { - width: 4px; - height: 4px; - margin-left: -4px; - margin-top: -3px; - border-radius: 5px; - position: absolute; - box-shadow: 0 0 2px rgba(0, 0, 0, 0.6); - background: white; - border-width: 2px; - border-style: solid; - display: none; - background-clip: padding-box; + width: 4px; + height: 4px; + margin-left: -3px; + margin-top: -3.5px; + border-radius: 5px; + position: absolute; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.6); + box-sizing: content-box; + -moz-box-sizing: content-box; + background: white; + border-width: 2px; + border-style: solid; + display: none; + background-clip: padding-box; } .rickshaw_graph .detail .dot.active { - display: block; + display: block; } /* graph */ .rickshaw_graph { - position: relative; + position: relative; } .rickshaw_graph svg { - display: block; - overflow: hidden; + display: block; + overflow: hidden; } /* ticks */ .rickshaw_graph .x_tick { - position: absolute; - top: 0; - bottom: 0; - width: 0px; - border-left: 1px dotted rgba(0, 0, 0, 0.2); - pointer-events: none; + position: absolute; + top: 0; + bottom: 0; + width: 0px; + border-left: 1px dotted rgba(0, 0, 0, 0.2); + pointer-events: none; } .rickshaw_graph .x_tick .title { - position: absolute; - font-size: 12px; - font-family: Arial, sans-serif; - opacity: 0.5; - white-space: nowrap; - margin-left: 3px; - bottom: 1px; + position: absolute; + font-size: 12px; + font-family: Arial, sans-serif; + opacity: 0.5; + white-space: nowrap; + margin-left: 3px; + bottom: 1px; } /* annotations */ .rickshaw_annotation_timeline { - height: 1px; - border-top: 1px solid #e0e0e0; - margin-top: 10px; - position: relative; + height: 1px; + border-top: 1px solid #e0e0e0; + margin-top: 10px; + position: relative; } .rickshaw_annotation_timeline .annotation { - position: absolute; - height: 6px; - width: 6px; - margin-left: -2px; - top: -3px; - border-radius: 5px; - background-color: rgba(0, 0, 0, 0.25); + position: absolute; + height: 6px; + width: 6px; + margin-left: -2px; + top: -3px; + border-radius: 5px; + background-color: rgba(0, 0, 0, 0.25); } .rickshaw_graph .annotation_line { - position: absolute; - top: 0; - bottom: -6px; - width: 0px; - border-left: 2px solid rgba(0, 0, 0, 0.3); - display: none; + position: absolute; + top: 0; + bottom: -6px; + width: 0px; + border-left: 2px solid rgba(0, 0, 0, 0.3); + display: none; } .rickshaw_graph .annotation_line.active { - display: block; + display: block; } .rickshaw_graph .annotation_range { @@ -145,176 +177,179 @@ } .rickshaw_annotation_timeline .annotation .content { - background: white; - color: black; - opacity: 0.9; - padding: 5px 5px; - box-shadow: 0 0 2px rgba(0, 0, 0, 0.8); - border-radius: 3px; - position: relative; - z-index: 20; - font-size: 12px; - padding: 6px 8px 8px; - top: 18px; - left: -11px; - width: 160px; - display: none; - cursor: pointer; + background: white; + color: black; + opacity: 0.9; + padding: 5px 5px; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.8); + border-radius: 3px; + position: relative; + z-index: 20; + font-size: 12px; + padding: 6px 8px 8px; + top: 18px; + left: -11px; + width: 160px; + display: none; + cursor: pointer; } .rickshaw_annotation_timeline .annotation .content:before { - content: "\25b2"; - position: absolute; - top: -11px; - color: white; - text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8); + content: "\25b2"; + position: absolute; + top: -11px; + color: white; + text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8); } .rickshaw_annotation_timeline .annotation.active, .rickshaw_annotation_timeline .annotation:hover { - background-color: rgba(0, 0, 0, 0.8); - cursor: none; + background-color: rgba(0, 0, 0, 0.8); + cursor: none; } .rickshaw_annotation_timeline .annotation .content:hover { - z-index: 50; + z-index: 50; } .rickshaw_annotation_timeline .annotation.active .content { - display: block; + display: block; } .rickshaw_annotation_timeline .annotation:hover .content { - display: block; - z-index: 50; + display: block; + z-index: 50; } .rickshaw_graph .y_axis, .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 { - stroke: rgba(0, 0, 0, 0.16); - stroke-width: 2px; - shape-rendering: crisp-edges; - pointer-events: none; + stroke: rgba(0, 0, 0, 0.16); + stroke-width: 2px; + shape-rendering: crisp-edges; + pointer-events: none; } .rickshaw_graph .y_grid .tick, .rickshaw_graph .x_grid_d3 .tick { - z-index: -1; - stroke: rgba(0, 0, 0, 0.20); - stroke-width: 1px; - stroke-dasharray: 1 1; + z-index: -1; + stroke: rgba(0, 0, 0, 0.20); + stroke-width: 1px; + stroke-dasharray: 1 1; +} +.rickshaw_graph .y_grid .tick[data-y-value="0"] { + stroke-dasharray: 1 0; } .rickshaw_graph .y_grid path, .rickshaw_graph .x_grid_d3 path { - fill: none; - stroke: none; + fill: none; + stroke: none; } .rickshaw_graph .y_ticks path, .rickshaw_graph .x_ticks_d3 path { - fill: none; - stroke: #808080; + fill: none; + stroke: #808080; } .rickshaw_graph .y_ticks text, .rickshaw_graph .x_ticks_d3 text { - opacity: 0.5; - font-size: 12px; - pointer-events: none; + opacity: 0.5; + font-size: 12px; + pointer-events: none; } .rickshaw_graph .x_tick.glow .title, .rickshaw_graph .y_ticks.glow text { - fill: black; - color: black; - 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), - 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 -1px 0 rgba(255, 255, 255, 0.1); + fill: black; + color: black; + 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), + 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 -1px 0 rgba(255, 255, 255, 0.1); } .rickshaw_graph .x_tick.inverse .title, .rickshaw_graph .y_ticks.inverse text { - fill: white; - color: white; - 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), - 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 -1px 0 rgba(0, 0, 0, 0.8); + fill: white; + color: white; + 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), + 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 -1px 0 rgba(0, 0, 0, 0.8); } .rickshaw_legend { - font-family: Arial; - font-size: 12px; - color: white; - background: #404040; - display: inline-block; - padding: 12px 5px; - border-radius: 2px; - position: relative; + font-family: Arial; + font-size: 12px; + color: white; + background: #404040; + display: inline-block; + padding: 12px 5px; + border-radius: 2px; + position: relative; } .rickshaw_legend:hover { - z-index: 10; + z-index: 10; } .rickshaw_legend .swatch { - width: 10px; - height: 10px; - border: 1px solid rgba(0, 0, 0, 0.2); + width: 10px; + height: 10px; + border: 1px solid rgba(0, 0, 0, 0.2); } .rickshaw_legend .line { - clear: both; - line-height: 140%; - padding-right: 15px; + clear: both; + line-height: 140%; + padding-right: 15px; } .rickshaw_legend .line .swatch { - display: inline-block; - margin-right: 3px; - border-radius: 2px; + display: inline-block; + margin-right: 3px; + border-radius: 2px; } .rickshaw_legend .label { - margin: 0; - white-space: nowrap; - display: inline; - font-size: inherit; - background-color: transparent; - color: inherit; - font-weight: normal; - line-height: normal; - padding: 0px; - text-shadow: none; + margin: 0; + white-space: nowrap; + display: inline; + font-size: inherit; + background-color: transparent; + color: inherit; + font-weight: normal; + line-height: normal; + padding: 0px; + text-shadow: none; } .rickshaw_legend .action:hover { - opacity: 0.6; + opacity: 0.6; } .rickshaw_legend .action { - margin-right: 0.2em; - font-size: 10px; - opacity: 0.2; - cursor: pointer; - font-size: 14px; + margin-right: 0.2em; + font-size: 10px; + opacity: 0.2; + cursor: pointer; + font-size: 14px; } .rickshaw_legend .line.disabled { - opacity: 0.4; + opacity: 0.4; } .rickshaw_legend ul { - list-style-type: none; - margin: 0; - padding: 0; - margin: 2px; - cursor: pointer; + list-style-type: none; + margin: 0; + padding: 0; + margin: 2px; + cursor: pointer; } .rickshaw_legend li { - padding: 0 0 0 2px; - min-width: 80px; - white-space: nowrap; + padding: 0 0 0 2px; + min-width: 80px; + white-space: nowrap; } .rickshaw_legend li:hover { - background: rgba(255, 255, 255, 0.08); - border-radius: 3px; + background: rgba(255, 255, 255, 0.08); + border-radius: 3px; } .rickshaw_legend li:active { - background: rgba(255, 255, 255, 0.2); - border-radius: 3px; + background: rgba(255, 255, 255, 0.2); + border-radius: 3px; } diff --git a/xstatic/pkg/rickshaw/data/rickshaw.js b/xstatic/pkg/rickshaw/data/rickshaw.js index 0451c93..c2d5519 100644 --- a/xstatic/pkg/rickshaw/data/rickshaw.js +++ b/xstatic/pkg/rickshaw/data/rickshaw.js @@ -1931,6 +1931,8 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) { line.element.classList.add('disabled'); } + self.graph.update(); + }.bind(this); 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; - self.graph.update(); }; s.enable = function() { s.disabled = false; - self.graph.update(); }; } ); }; @@ -3759,7 +3761,6 @@ Rickshaw.Graph.Smoother = Rickshaw.Class.create({ max: 100, slide: function( event, ui ) { self.setScale(ui.value); - self.graph.update(); } } ); } );