maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Update all JQuery related libraries to more recent versions

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-21 12:47:53 +02:00
parent 5ceaede1a9
commit fc802f8087
66 changed files with 6714 additions and 2595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
js/plugins/jqplot.trendline.js
View File

@@ -2,9 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.0b2_r792
* Version: 1.0.8
* Revision: 1250
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2013 Chris Leonello
* jqPlot is currently available for use in all personal or commercial projects
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can
@@ -59,7 +60,7 @@
// Either 'exponential', 'exp', or 'linear'.
this.type = 'linear';
// prop: shadow
// true or false, wether or not to show the shadow.
// true or false, whether or not to show the shadow.
this.shadow = true;
// prop: markerRenderer
// Renderer to use to draw markers on the line.
@@ -92,17 +93,19 @@
// current series passed in
// must return null or an object {label:label, color:color}
function addTrendlineLegend(series) {
var lt = series.trendline.label.toString();
var ret = null;
if (this.renderer.constructor != $.jqplot.PieRenderer && series.trendline.show && lt) {
ret = {label:lt, color:series.trendline.color};
if (series.trendline && series.trendline.show) {
var lt = series.trendline.label.toString();
if (lt) {
ret = {label:lt, color:series.trendline.color};
}
}
return ret;
}
// called within scope of a series
function parseTrendLineOptions (target, data, seriesDefaults, options, plot) {
if (this.renderer.constructor == $.jqplot.LineRenderer) {
if (this._type && (this._type === 'line' || this._type == 'bar')) {
this.trendline = new $.jqplot.Trendline();
options = options || {};
$.extend(true, this.trendline, {color:this.color}, seriesDefaults.trendline, options.trendline);
@@ -115,7 +118,7 @@
// if we have options, merge trendline options in with precedence
options = $.extend(true, {}, this.trendline, options);
if (options.show && this.renderer.constructor != $.jqplot.PieRenderer) {
if (this.trendline && options.show) {
var fit;
// this.renderer.setGridData.call(this);
var data = options.data || this.data;