Skip to content

fixes #132: fixed bug where bar and tristate charts didn't listen to the `.wid... #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes #132: fixed bug where bar and tristate charts didn't listen to the `.wid... #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 134 additions & 0 deletions sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<head>

<style>
</style>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.0.min.js"></script>
<script type="text/javascript" src="dist/jquery.sparkline.js"></script>

<script type="text/javascript">
$(function() {
/** This code runs when everything has been loaded on the page */
/* Inline sparklines take their values from the contents of the tag */
$('.inlinesparkline').sparkline();

/* Sparklines can also take their values from the first argument
passed to the sparkline() function */
var myvalues = [[100,80,50,70,40,40,10], [90,40,20,60,80,20,19]];
$('.dynamicsparkline').sparkline(myvalues);

/* The second argument gives options such as chart type */
$('.dynamicbar').sparkline(myvalues, {type: 'bar', barColor: 'green'} );

/* Use 'html' instead of an array of values to pass options
to a sparkline with data in the tag */
$('.inlinebar').sparkline('html', {type: 'bar', barColor: 'red'} );



var types = ['line', 'bar', 'tristate', 'bullet', 'discrete', 'pie', 'box'];
var datavalues = [null, null, 1, 100,80,50,70,40,40,10, null, 100, null, 1000, -20, null, 90,40,20,60,80,20,19];
for (var i = 0; i < types.length; i++) {
var type = types[i];

$('.test-basic-' + type).sparkline(datavalues, {
type: type,
barColor: 'red'
});

var $el = $('.fixed-dimensions-' + type);
console.log("w/h: ", $el.width(), $el.height());
$el.sparkline(datavalues, {
type: type,
barColor: 'red',
width: $el.innerWidth(),
height: $el.innerHeight()
});
}
});

</script>
</head>
<body>

<p>
Inline Sparkline: <span class="inlinesparkline">1,4,4,7,5,9,10</span>.
</p>
<p>
Sparkline with dynamic data: <span class="dynamicsparkline">Loading..</span>
</p>
<p>
Bar chart with dynamic data: <span class="dynamicbar">Loading..</span>
</p>
<p>
Bar chart with inline data: <span class="inlinebar">1,3,4,5,3,5</span>
</p>

<hr />
<h1>Default sparklines</h1>
<p>
Line chart: <span class="test-basic-line">Loading..</span>
</p>
<p>
Bar chart: <span class="test-basic-bar">Loading..</span>
</p>
<p>
Tristate chart: <span class="test-basic-tristate">Loading..</span>
</p>
<p>
Bullet chart: <span class="test-basic-bullet">Loading..</span>
</p>
<p>
Discrete chart: <span class="test-basic-discrete">Loading..</span>
</p>
<p>
Pie chart: <span class="test-basic-pie">Loading..</span>
</p>
<p>
Box chart: <span class="test-basic-box">Loading..</span>
</p>

<hr />
<h1>Fixed-dimension sparklines</h1>
<style>
.fixed-dimensions
{
display: inline-block;
padding: 1px;
border: 1px solid grey;

width: 40px;
height: 20px;
}
.wrapper
{
display: inline-block;

padding: 1px;
border: 1px dotted black;
}
</style>
<p>
Line chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-line">Loading..</span></span>
</p>
<p>
Bar chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-bar">Loading..</span></span>
</p>
<p>
Tristate chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-tristate">Loading..</span></span>
</p>
<p>
Bullet chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-bullet">Loading..</span></span>
</p>
<p>
Discrete chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-discrete">Loading..</span></span>
</p>
<p>
Pie chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-pie">Loading..</span></span>
</p>
<p>
Box chart: <span class="wrapper"><span class="fixed-dimensions fixed-dimensions-box">Loading..</span></span>
</p>
</body>
</html>
9 changes: 6 additions & 3 deletions src/chart-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
this.barWidth = barWidth;
this.barSpacing = barSpacing;
this.totalBarWidth = barWidth + barSpacing;
this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
var rawWidth = (values.length * barWidth) + ((values.length - 1) * barSpacing);
this.xScale = Math.min(1, rawWidth ? width / rawWidth : 1);
this.width = rawWidth * this.xScale;

this.initTarget();

Expand Down Expand Up @@ -103,7 +105,7 @@
this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
if (min <= 0 && max >= 0 && zeroAxis) {
xaxisOffset = 0;
} else if (zeroAxis == false) {
} else if (zeroAxis === false) {
xaxisOffset = min;
} else if (min > 0) {
xaxisOffset = min;
Expand Down Expand Up @@ -145,6 +147,7 @@
},

getRegion: function (el, x, y) {
x /= this.xScale;
var result = Math.floor(x / this.totalBarWidth);
return (result < 0 || result >= this.values.length) ? undefined : result;
},
Expand Down Expand Up @@ -245,7 +248,7 @@
if (highlight) {
color = this.calcHighlightColor(color, options);
}
result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
result.push(target.drawRect(x * this.xScale, y, (this.barWidth - 1) * this.xScale, height - 1, color, color));
}
if (result.length === 1) {
return result[0];
Expand Down
1 change: 0 additions & 1 deletion src/chart-line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
this.xvalues = xvalues;
this.yvalues = yvalues;
this.yminmax = yminmax;

},

processRangeOptions: function () {
Expand Down
6 changes: 4 additions & 2 deletions src/chart-tristate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
this.barSpacing = barSpacing;
this.totalBarWidth = barWidth + barSpacing;
this.values = $.map(values, Number);
this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
var rawWidth = (values.length * barWidth) + ((values.length - 1) * barSpacing);
this.xScale = Math.min(1, rawWidth ? width / rawWidth : 1);
this.width = rawWidth * this.xScale;

if ($.isArray(options.get('colorMap'))) {
this.colorMapByIndex = options.get('colorMap');
Expand Down Expand Up @@ -92,7 +94,7 @@
if (highlight) {
color = this.calcHighlightColor(color, options);
}
return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
return target.drawRect(x * this.xScale, y, (this.barWidth - 1) * this.xScale, height - 1, color, color);
}
});