Bug 1119243 - The LineGraph should always show the gutter, even if arrows are disabled for tooltips, r=jsantell

This commit is contained in:
Victor Porof 2015-01-11 12:56:30 -05:00
Родитель 2c72cc9e10
Коммит e2c7fe162d
3 изменённых файлов: 5 добавлений и 17 удалений

Просмотреть файл

@ -31,8 +31,8 @@ function* performTest() {
function* testGraph(graph) { function* testGraph(graph) {
yield graph.setDataWhenReady(TEST_DATA); yield graph.setDataWhenReady(TEST_DATA);
is(graph._gutter.hidden, true, is(graph._gutter.hidden, false,
"The gutter should be hidden because the tooltips don't have arrows."); "The gutter should be visible even if the tooltips don't have arrows.");
is(graph._maxTooltip.hidden, false, is(graph._maxTooltip.hidden, false,
"The max tooltip should not be hidden."); "The max tooltip should not be hidden.");
is(graph._avgTooltip.hidden, false, is(graph._avgTooltip.hidden, false,

Просмотреть файл

@ -1456,7 +1456,7 @@ LineGraphWidget.prototype = Heritage.extend(AbstractCanvasGraph.prototype, {
this._maxTooltip.hidden = this._showMax === false || !totalTicks || distanceMinMax < LINE_GRAPH_MIN_MAX_TOOLTIP_DISTANCE; this._maxTooltip.hidden = this._showMax === false || !totalTicks || distanceMinMax < LINE_GRAPH_MIN_MAX_TOOLTIP_DISTANCE;
this._avgTooltip.hidden = this._showAvg === false || !totalTicks; this._avgTooltip.hidden = this._showAvg === false || !totalTicks;
this._minTooltip.hidden = this._showMin === false || !totalTicks; this._minTooltip.hidden = this._showMin === false || !totalTicks;
this._gutter.hidden = (this._showMin === false && this._showMax === false) || !totalTicks || !this.withTooltipArrows; this._gutter.hidden = (this._showMin === false && this._showAvg === false && this._showMax === false) || !totalTicks;
this._maxGutterLine.hidden = this._showMax === false; this._maxGutterLine.hidden = this._showMax === false;
this._avgGutterLine.hidden = this._showAvg === false; this._avgGutterLine.hidden = this._showAvg === false;

Просмотреть файл

@ -935,26 +935,14 @@
} }
.line-graph-widget-tooltip[type=maximum] { .line-graph-widget-tooltip[type=maximum] {
left: -1px; left: 14px;
} }
.line-graph-widget-tooltip[type=minimum] { .line-graph-widget-tooltip[type=minimum] {
left: -1px; left: 14px;
} }
.line-graph-widget-tooltip[type=average] { .line-graph-widget-tooltip[type=average] {
right: -1px;
}
.line-graph-widget-tooltip[type=maximum][with-arrows=true] {
left: 14px;
}
.line-graph-widget-tooltip[type=minimum][with-arrows=true] {
left: 14px;
}
.line-graph-widget-tooltip[type=average][with-arrows=true] {
right: 4px; right: 4px;
} }