holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update jqplot to

Browse Source 
jquery.jqplot.1.0.0b2_r947
This commit is contained in:
Nathan Gray
2011-11-07 20:37:55 +00:00
parent 78855f0652
commit f8489c0ed1
256 changed files with 13654 additions and 3389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/js/jquery/jqplot/plugins/jqplot.trendline.js
View File

@ -2,7 +2,7 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.0b2_r792
* Version: 1.0.0b2_r947
*
* Copyright (c) 2009-2011 Chris Leonello
* jqPlot is currently available for use in all personal or commercial projects
@ -92,17 +92,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 +117,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;