knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build][xs]: build.

Browse Source
This commit is contained in:
Rufus Pollock
2013-02-09 18:30:11 +00:00
parent b6e179e3e7
commit ba7e747b97
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/recline.css vendored
View File

@@ -1,23 +1,23 @@
.recline-graph .graph { .recline-flot .graph {
height: 500px; height: 500px;
overflow: hidden; overflow: hidden;
} }
.recline-graph .legend table { .recline-flot .legend table {
width: auto; width: auto;
margin-bottom: 0; margin-bottom: 0;
} }
.recline-graph .legend td { .recline-flot .legend td {
padding: 5px; padding: 5px;
line-height: 13px; line-height: 13px;
} }
.recline-graph .graph .alert { .recline-flot .graph .alert {
width: 450px; width: 450px;
} }
#recline-graph-tooltip { #recline-flot-tooltip {
position: absolute; position: absolute;
background-color: #FEE !important; background-color: #FEE !important;
color: #000000 !important; color: #000000 !important;

11
dist/recline.js vendored
View File

@@ -2024,7 +2024,7 @@ this.recline.View = this.recline.View || {};
// generate the element itself (you can then append view.el to the DOM. // generate the element itself (you can then append view.el to the DOM.
my.Flot = Backbone.View.extend({ my.Flot = Backbone.View.extend({
template: ' \ template: ' \
<div class="recline-graph"> \ <div class="recline-flot"> \
<div class="panel graph" style="display: block;"> \ <div class="panel graph" style="display: block;"> \
<div class="js-temp-notice alert alert-block"> \ <div class="js-temp-notice alert alert-block"> \
<h3 class="alert-heading">Hey there!</h3> \ <h3 class="alert-heading">Hey there!</h3> \
@@ -2091,9 +2091,6 @@ my.Flot = Backbone.View.extend({
// check we have something to plot // check we have something to plot
if (this.state.get('group') && this.state.get('series')) { if (this.state.get('group') && this.state.get('series')) {
// faff around with width because flot draws axes *outside* of the element
// width which means graph can get push down as it hits element next to it
this.$graph.width(this.el.width() - 240);
var series = this.createSeries(); var series = this.createSeries();
var options = this.getGraphOptions(this.state.attributes.graphType, series[0].data.length); var options = this.getGraphOptions(this.state.attributes.graphType, series[0].data.length);
this.plot = $.plot(this.$graph, series, options); this.plot = $.plot(this.$graph, series, options);
@@ -2114,7 +2111,7 @@ my.Flot = Backbone.View.extend({
this.previousTooltipPoint.y !== item.seriesIndex) { this.previousTooltipPoint.y !== item.seriesIndex) {
this.previousTooltipPoint.x = item.dataIndex; this.previousTooltipPoint.x = item.dataIndex;
this.previousTooltipPoint.y = item.seriesIndex; this.previousTooltipPoint.y = item.seriesIndex;
$("#recline-graph-tooltip").remove(); $("#recline-flot-tooltip").remove();
var x = item.datapoint[0].toFixed(2), var x = item.datapoint[0].toFixed(2),
y = item.datapoint[1].toFixed(2); y = item.datapoint[1].toFixed(2);
@@ -2136,13 +2133,13 @@ my.Flot = Backbone.View.extend({
yLocation = item.pageY - 20; yLocation = item.pageY - 20;
} }
$('<div id="recline-graph-tooltip">' + content + '</div>').css({ $('<div id="recline-flot-tooltip">' + content + '</div>').css({
top: yLocation, top: yLocation,
left: xLocation left: xLocation
}).appendTo("body").fadeIn(200); }).appendTo("body").fadeIn(200);
} }
} else { } else {
$("#recline-graph-tooltip").remove(); $("#recline-flot-tooltip").remove();
this.previousTooltipPoint.x = null; this.previousTooltipPoint.x = null;
this.previousTooltipPoint.y = null; this.previousTooltipPoint.y = null;
} }