Skip to content

Commit d96a669

Browse files
committed
1.0.9 Release
1 parent 080c6de commit d96a669

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+489
-100
lines changed

Diff for: NDdata/Menu.txt

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ Group: API Documentation {
9090
File: jqplot.donutRenderer.js (plugins\jqplot.donutRenderer.js)
9191
File: jqplot.dragable.js (plugins\jqplot.dragable.js)
9292
File: jqplot.enhancedLegendRenderer.js (plugins\jqplot.enhancedLegendRenderer.js)
93+
File: jqplot.enhancedPieLegendRenderer.js (plugins\jqplot.enhancedPieLegendRenderer.js)
9394
File: jqplot.funnelRenderer.js (plugins\jqplot.funnelRenderer.js)
9495
File: jqplot.highlighter.js (plugins\jqplot.highlighter.js)
9596
File: jqplot.logAxisRenderer.js (plugins\jqplot.logAxisRenderer.js)

Diff for: examples/pieChartsEnhancedLegend.php

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?php
2+
$title = "Pie Charts with Enhanced Legend Renderer";
3+
// $plotTargets = array (array('id'=>'chart1', 'width'=>600, 'height'=>400));
4+
?>
5+
<?php include "opener.php"; ?>
6+
7+
<style>
8+
#chart10 td.jqplot-table-legend-label {
9+
white-space: normal;
10+
}
11+
#chart11 td.jqplot-table-legend-label {
12+
white-space: normal;
13+
}
14+
#chart12 td.jqplot-table-legend-label {
15+
white-space: normal;
16+
}
17+
</style>
18+
19+
<!-- Example scripts go here --><!DOCTYPE html>
20+
21+
<div style="margin-left:20px; margin-top:20px;">The EnhancedPieLegendRenderer allows use of shorter legend labels, but longer tooltips.</div>
22+
<div id="chart1" style="margin-top:20px; margin-left:20px; width:460px; height:300px;"></div>
23+
24+
<div id="chart2" style="margin-top:20px; margin-left:20px; width:460px; height:300px;"></div>
25+
26+
<div id="chart3" style="margin-top:20px; margin-left:20px; width:460px; height:300px;"></div>
27+
28+
<script class="code" type="text/javascript">$(document).ready(function(){
29+
30+
data1 = [[['Apples', 210],['Oranges', 111], ['Bananas', 74], ['Grapes', 72],['Pears', 49]]];
31+
toolTip1 = ['Red Delicious Apples', 'Parson Brown Oranges', 'Cavendish Bananas', 'Albaranzeuli Nero Grapes', 'Green Anjou Pears'];
32+
33+
var plot1 = jQuery.jqplot('chart1',
34+
data1,
35+
{
36+
title: ' ',
37+
seriesDefaults: {
38+
shadow: false,
39+
renderer: jQuery.jqplot.PieRenderer,
40+
rendererOptions: { padding: 2, sliceMargin: 2, showDataLabels: true }
41+
},
42+
legend: {
43+
show: true,
44+
location: 'e',
45+
renderer: $.jqplot.EnhancedPieLegendRenderer,
46+
rendererOptions: {
47+
numberColumns: 1,
48+
toolTips: toolTip1
49+
}
50+
},
51+
}
52+
);
53+
});</script>
54+
55+
<!-- End example scripts -->
56+
57+
<!-- Don't touch this! -->
58+
59+
<?php include "commonScripts.html" ?>
60+
61+
<!-- End Don't touch this! -->
62+
63+
<!-- Additional plugins go here -->
64+
65+
<script class="include" type="text/javascript" src="../src/plugins/jqplot.pieRenderer.js"></script>
66+
<script class="include" type="text/javascript" src="../src/plugins/jqplot.enhancedPieLegendRenderer.js"></script>
67+
68+
<!-- End additional plugins -->
69+
70+
<?php include "closer.php"; ?>

Diff for: jqPlot.jquery.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"charting",
88
"graphing"
99
],
10-
"version": "1.0.8",
10+
"version": "1.0.9",
1111
"author": {
1212
"name": "Chris Leonello",
1313
"url": "http://http://www.jqplot.com/info.php"

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jqplot",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"description": "jqPlot is a plotting and charting plugin for the jQuery Javascript framework. jqPlot produces beautiful line, bar and pie charts with many features.",
55
"author": "Chris Leonello <[email protected]>",
66
"contributors": [

Diff for: src/changes.txt

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
Title: Change Log
22

3+
1.0.9:
4+
* Convert toolchain to grunt
5+
* Add "step" chart style
6+
* Refactor code according to JSLint rules (johanbove)
7+
* Add enhancedPieLegendRenderer
8+
* Pull request #17: Fix infinite loop
9+
* Pull request #22: Update jqplot.pointLabels.js
10+
* Pull request #23 Update jqplot.pieRenderer.js
11+
* Pull request #25: barRenderer resizing fix
12+
* Pull request #26: Error resizing horizontal bar charts
13+
314
1.0.8:
415
* Issue #375: sortMergedLabels does not sort string labels
516
* Issue #279: Groups > 3 Causes Alignment Issues

Diff for: src/jqplot.axisLabelRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.axisTickRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.canvasGridRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.core.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* About: Copyright & License
1212
*
13-
* Copyright (c) 2009-2015 Chris Leonello
13+
* Copyright (c) 2009-2016 Chris Leonello
1414
* jqPlot is currently available for use in all personal or commercial projects
1515
* under both the MIT and GPL version 2.0 licenses. This means that you can
1616
* choose the license that best suits your project and use it accordingly.

Diff for: src/jqplot.divTitleRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.linePattern.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.lineRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.linearAxisRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.linearTickGenerator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.markerRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.shadowRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.shapeRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.sprintf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.tableLegendRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.themeEngine.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jqplot.toImage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jquery.jqplot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/jsdate.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -728,10 +728,18 @@
728728

729729
'sv': {
730730
monthNames: ['januari','februari','mars','april','maj','juni','juli','augusti','september','oktober','november','december'],
731-
monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'],
731+
monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'],
732732
dayNames: ['söndag','måndag','tisdag','onsdag','torsdag','fredag','lördag'],
733733
dayNamesShort: ['sön','mån','tis','ons','tor','fre','lör'],
734734
formatString: '%Y-%m-%d %H:%M:%S'
735+
},
736+
737+
'it': {
738+
monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno','Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
739+
monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu','Lug','Ago','Set','Ott','Nov','Dic'],
740+
dayNames: ['Domenica','Lunedi','Martedi','Mercoledi','Giovedi','Venerdi','Sabato'],
741+
dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
742+
formatString: '%d-%m-%Y %H:%M:%S'
735743
}
736744

737745
};

Diff for: src/plugins/jqplot.BezierCurveRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.barRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.blockRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.bubbleRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.canvasAxisLabelRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.canvasAxisTickRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.canvasOverlay.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.canvasTextRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.categoryAxisRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.ciParser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.cursor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

Diff for: src/plugins/jqplot.dateAxisRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Version: @VERSION
66
* Revision: @REVISION
77
*
8-
* Copyright (c) 2009-2015 Chris Leonello
8+
* Copyright (c) 2009-2016 Chris Leonello
99
* jqPlot is currently available for use in all personal or commercial projects
1010
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
1111
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can

0 commit comments

Comments
 (0)