extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-09 08:25:03 +02:00
Code Issues 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.pointLabels.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
@ -138,7 +138,7 @@
$.jqplot.PointLabels.init = function (target, data, seriesDefaults, opts){
var options = $.extend(true, {}, seriesDefaults, opts);
options.pointLabels = options.pointLabels || {};
if (this.renderer.constructor == $.jqplot.BarRenderer && this.barDirection == 'horizontal' && !options.pointLabels.location) {
if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal' && !options.pointLabels.location) {
options.pointLabels.location = 'e';
}
// add a pointLabels attribute to the series plugins
@ -153,14 +153,14 @@
if (p.seriesLabelIndex != null) {
labelIdx = p.seriesLabelIndex;
}
else if (this.renderer.constructor == $.jqplot.BarRenderer && this.barDirection == 'horizontal') {
else if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal') {
labelIdx = 0;
}
else {
labelIdx = this._plotData[0].length -1;
labelIdx = (this._plotData.length === 0) ? 0 : this._plotData[0].length -1;
}
p._labels = [];
if (p.labels.length == 0 || p.labelsFromSeries) {
if (p.labels.length === 0 || p.labelsFromSeries) {
if (p.stackedValue) {
if (this._plotData.length && this._plotData[0].length){
// var idx = p.seriesLabelIndex || this._plotData[0].length -1;
@ -171,7 +171,7 @@
}
else {
var d = this._plotData;
if (this.renderer.constructor == $.jqplot.BarRenderer && this.waterfall) {
if (this.renderer.constructor === $.jqplot.BarRenderer && this.waterfall) {
d = this._data;
}
if (d.length && d[0].length) {
@ -316,7 +316,7 @@
elem.html(label);
}
var location = p.location;
if ((this.fillToZero && pd[i][1] < 0) || (this.waterfall && parseInt(label, 10)) < 0) {
if ((this.fillToZero && pd[i][1] < 0) || (this.fillToZero && this._type === 'bar' && this.barDirection === 'horizontal' && pd[i][0] < 0) || (this.waterfall && parseInt(label, 10)) < 0) {
location = oppositeLocations[locationIndicies[location]];
}
var ell = xax.u2p(pd[i][0]) + p.xOffset(elem, location);