gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgraded jqPlot to 1.0.4 r1121

Browse Source
This commit is contained in:
Marc Delisle 2013-01-01 11:05:42 -05:00
parent 3474c71cc9
commit 1681bd3b53
11 changed files with 219 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -81,6 +81,7 @@ VerboseMultiSubmit, ReplaceHelpImg
+ Removed the AjaxEnable directive
+ rfe #3542567 Accept IPv6 ranges and IPv6 CIDR notations in $cfg['Servers'][$i]['AllowDeny']['rules']
- Bug #3576788 Grid editing shows the value before silent truncation
- Upgraded jqPlot to 1.0.4 r1121
3.5.6.0 (not yet released)
- bug #3593604 [status] Erroneous advisor rule

143
js/jqplot/jquery.jqplot.js
View File

@ -5,12 +5,12 @@
*
* About: Version
*
* version: 1.0.2
* revision: 1108
* version: 1.0.4
* revision: 1121
*
* About: Copyright & License
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 Chris Leonello
* jqPlot is currently available for use in all personal or commercial projects
* under both the MIT and GPL version 2.0 licenses. This means that you can
* choose the license that best suits your project and use it accordingly.
@ -244,8 +244,8 @@
}
};
$.jqplot.version = "1.0.2";
$.jqplot.revision = "1108";
$.jqplot.version = "1.0.4";
$.jqplot.revision = "1121";
$.jqplot.targetCounter = 1;
@ -1143,7 +1143,8 @@
* by the Plot oject. Series properties can be set or overriden by the
* options passed in from the user.
*/
function Series() {
function Series(options) {
options = options || {};
$.jqplot.ElemContainer.call(this);
// Group: Properties
// Properties will be assigned from a series array at the top level of the
@ -1316,8 +1317,8 @@
this.index = index;
this.gridBorderWidth = gridbw;
var d = this.data;
var temp = [], i;
for (i=0; i<d.length; i++) {
var temp = [], i, l;
for (i=0, l=d.length; i<l; i++) {
if (! this.breakOnNull) {
if (d[i] == null || d[i][0] == null || d[i][1] == null) {
continue;
@ -2095,6 +2096,7 @@
this.legend.init();
this._sumy = 0;
this._sumx = 0;
this.computePlotData();
for (var i=0; i<this.series.length; i++) {
// set default stacking order for series canvases
this.seriesStack.push(i);
@ -2107,7 +2109,7 @@
for (var j=0; j<this.preSeriesInitHooks.hooks.length; j++) {
this.preSeriesInitHooks.hooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
}
this.populatePlotData(this.series[i], i);
// this.populatePlotData(this.series[i], i);
this.series[i]._plotDimensions = this._plotDimensions;
this.series[i].init(i, this.grid.borderWidth, this);
for (var j=0; j<$.jqplot.postSeriesInitHooks.length; j++) {
@ -2283,6 +2285,7 @@
this.seriesStack = [];
this.previousSeriesStack = [];
this.computePlotData();
for (var i=0, l=this.series.length; i<l; i++) {
// set default stacking order for series canvases
this.seriesStack.push(i);
@ -2295,7 +2298,7 @@
for (var j=0; j<this.preSeriesInitHooks.hooks.length; j++) {
this.preSeriesInitHooks.hooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
}
this.populatePlotData(this.series[i], i);
// this.populatePlotData(this.series[i], i);
this.series[i]._plotDimensions = this._plotDimensions;
this.series[i].init(i, this.grid.borderWidth, this);
for (var j=0; j<$.jqplot.postSeriesInitHooks.length; j++) {
@ -2388,8 +2391,9 @@
this._sumy = 0;
this._sumx = 0;
this.computePlotData();
for (var i=0; i<this.series.length; i++) {
this.populatePlotData(this.series[i], i);
// this.populatePlotData(this.series[i], i);
if (this.series[i]._type === 'line' && this.series[i].renderer.bands.show) {
this.series[i].renderer.initBands.call(this.series[i], this.series[i].renderer.options, this);
}
@ -2469,6 +2473,81 @@
}
}
this.computePlotData = function() {
this._plotData = [];
this._stackData = [];
var series,
index,
l;
for (index=0, l=this.series.length; index<l; index++) {
series = this.series[index];
this._plotData.push([]);
this._stackData.push([]);
var cd = series.data;
this._plotData[index] = $.extend(true, [], cd);
this._stackData[index] = $.extend(true, [], cd);
series._plotData = this._plotData[index];
series._stackData = this._stackData[index];
var plotValues = {x:[], y:[]};
if (this.stackSeries && !series.disableStack) {
series._stack = true;
///////////////////////////
// have to check for nulls
///////////////////////////
var sidx = (series._stackAxis === 'x') ? 0 : 1;
for (var k=0, cdl=cd.length; k<cdl; k++) {
var temp = cd[k][sidx];
if (temp == null) {
temp = 0;
}
this._plotData[index][k][sidx] = temp;
this._stackData[index][k][sidx] = temp;
if (index > 0) {
for (var j=index; j--;) {
var prevval = this._plotData[j][k][sidx];
// only need to sum up the stack axis column of data
// and only sum if it is of same sign.
// if previous series isn't same sign, keep looking
// at earlier series untill we find one of same sign.
if (temp * prevval >= 0) {
this._plotData[index][k][sidx] += prevval;
this._stackData[index][k][sidx] += prevval;
break;
}
}
}
}
}
else {
for (var i=0; i<series.data.length; i++) {
plotValues.x.push(series.data[i][0]);
plotValues.y.push(series.data[i][1]);
}
this._stackData.push(series.data);
this.series[index]._stackData = series.data;
this._plotData.push(series.data);
series._plotData = series.data;
series._plotValues = plotValues;
}
if (index>0) {
series._prevPlotData = this.series[index-1]._plotData;
}
series._sumy = 0;
series._sumx = 0;
for (i=series.data.length-1; i>-1; i--) {
series._sumy += series.data[i][1];
series._sumx += series.data[i][0];
}
}
};
// populate the _stackData and _plotData arrays for the plot and the series.
this.populatePlotData = function(series, index) {
@ -2480,23 +2559,28 @@
var plotValues = {x:[], y:[]};
if (this.stackSeries && !series.disableStack) {
series._stack = true;
var sidx = series._stackAxis == 'x' ? 0 : 1;
var idx = sidx ? 0 : 1;
var sidx = (series._stackAxis === 'x') ? 0 : 1;
// var idx = sidx ? 0 : 1;
// push the current data into stackData
//this._stackData.push(this.series[i].data);
var temp = $.extend(true, [], series.data);
// create the data that will be plotted for this series
var plotdata = $.extend(true, [], series.data);
var tempx, tempy, dval, stackval, comparator;
// for first series, nothing to add to stackData.
for (var j=0; j<index; j++) {
var cd = this.series[j].data;
for (var k=0; k<cd.length; k++) {
temp[k][0] += cd[k][0];
temp[k][1] += cd[k][1];
dval = cd[k];
tempx = (dval[0] != null) ? dval[0] : 0;
tempy = (dval[1] != null) ? dval[1] : 0;
temp[k][0] += tempx;
temp[k][1] += tempy;
stackval = (sidx) ? tempy : tempx;
// only need to sum up the stack axis column of data
// and only sum if it is of same sign.
if (series.data[k][sidx] * cd[k][sidx] >= 0) {
plotdata[k][sidx] += cd[k][sidx];
if (series.data[k][sidx] * stackval >= 0) {
plotdata[k][sidx] += stackval;
}
}
}
@ -2609,13 +2693,13 @@
// return data as an array of point arrays,
// in form [[x1,y1...], [x2,y2...], ...]
var temp = [];
var i;
var i, l;
dir = dir || 'vertical';
if (!$.isArray(data[0])) {
// we have a series of scalars. One line with just y values.
// turn the scalar list of data into a data array of form:
// [[1, data[0]], [2, data[1]], ...]
for (i=0; i<data.length; i++) {
for (i=0, l=data.length; i<l; i++) {
if (dir == 'vertical') {
temp.push([start + i, data[i]]);
}
@ -2634,17 +2718,23 @@
var colorIndex = 0;
this.series = [];
for (var i=0; i<this.data.length; i++) {
var temp = new Series();
var sopts = $.extend(true, {index: i}, {seriesColors:this.seriesColors, negativeSeriesColors:this.negativeSeriesColors}, this.options.seriesDefaults, this.options.series[i], {rendererOptions:{animation:{show: this.animate}}});
// pass in options in case something needs set prior to initialization.
var temp = new Series(sopts);
for (var j=0; j<$.jqplot.preParseSeriesOptionsHooks.length; j++) {
$.jqplot.preParseSeriesOptionsHooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]);
}
for (var j=0; j<this.preParseSeriesOptionsHooks.hooks.length; j++) {
this.preParseSeriesOptionsHooks.hooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]);
}
$.extend(true, temp, {seriesColors:this.seriesColors, negativeSeriesColors:this.negativeSeriesColors}, this.options.seriesDefaults, this.options.series[i], {rendererOptions:{animation:{show: this.animate}}});
// Now go back and apply the options to the series. Really should just do this during initializaiton, but don't want to
// mess up preParseSeriesOptionsHooks at this point.
$.extend(true, temp, sopts);
var dir = 'vertical';
if (temp.renderer === $.jqplot.BarRenderer && temp.rendererOptions && temp.rendererOptions.barDirection == 'horizontal' && temp.transposeData === true) {
if (temp.renderer === $.jqplot.BarRenderer && temp.rendererOptions && temp.rendererOptions.barDirection == 'horizontal') {
dir = 'horizontal';
temp._stackAxis = 'x';
temp._primaryAxis = '_yaxis';
}
temp.data = normalizeData(this.data[i], dir, this.defaultAxisStart);
switch (temp.xaxis) {
@ -2807,12 +2897,13 @@
for (var ax in this.axes) {
this.axes[ax]._ticks = [];
}
for (var i=0; i<this.series.length; i++) {
this.populatePlotData(this.series[i], i);
}
this.computePlotData();
// for (var i=0; i<this.series.length; i++) {
// this.populatePlotData(this.series[i], i);
// }
this._sumy = 0;
this._sumx = 0;
for (i=0; i<this.series.length; i++) {
for (var i=0, tsl = this.series.length; i<tsl; i++) {
this._sumy += this.series[i]._sumy;
this._sumx += this.series[i]._sumx;
}

26
js/jqplot/plugins/jqplot.barRenderer.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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
@ -198,14 +198,20 @@
var count = 0;
for (var i=skip; i<l; i+=skip) {
this.data.splice(i+count, 0, [null, null]);
this._plotData.splice(i+count, 0, [null, null]);
this._stackData.splice(i+count, 0, [null, null]);
count++;
}
for (i=0; i<this.data.length; i++) {
if (this._primaryAxis == '_xaxis') {
this.data[i][0] = i+1;
this._plotData[i][0] = i+1;
this._stackData[i][0] = i+1;
}
else {
this.data[i][1] = i+1;
this._plotData[i][1] = i+1;
this._stackData[i][1] = i+1;
}
}
}
@ -377,7 +383,7 @@
ystart = getStart(this.index, i, this._plotData[i][1], plot, 'y');
}
// not stacked and first series in stack
// not stacked
else {
if (this.fillToZero) {
ystart = this._yaxis.series_u2p(0);
@ -463,7 +469,7 @@
else if (this.barDirection == 'horizontal'){
for (var i=0; i<gridData.length; i++) {
if (this.data[i][0] == null) {
if (!this._stack && this.data[i][0] == null) {
continue;
}
points = [];
@ -473,13 +479,13 @@
if (this._stack && this._prevGridData.length) {
xstart = getStart(this.index, i, this._plotData[i][0], plot, 'x');
}
// not stacked and first series in stack
// not stacked
else {
if (this.fillToZero) {
xstart = this._xaxis.series_u2p(0);
}
else if (this.waterfall && i > 0 && i < this.gridData.length-1) {
xstart = this.gridData[i-1][1];
xstart = this.gridData[i-1][0];
}
else if (this.waterfall && i == 0 && i < this.gridData.length-1) {
if (this._xaxis.min <= 0 && this._xaxis.max >= 0) {
@ -489,7 +495,7 @@
xstart = 0;
}
else {
xstart = ctx.canvas.width;
xstart = 0;
}
}
else if (this.waterfall && i == this.gridData.length - 1) {
@ -550,8 +556,8 @@
}
var clr = opts.fillStyle || this.color;
this._dataColors.push(clr);
this.renderer.shapeRenderer.draw(ctx, points, opts);
}
this.renderer.shapeRenderer.draw(ctx, points, opts);
}
}
}

6
js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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

8
js/jqplot/plugins/jqplot.canvasTextRenderer.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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
@ -29,7 +29,7 @@
*
* included jsDate library by Chris Leonello:
*
* Copyright (c) 2010-2011 Chris Leonello
* Copyright (c) 2010-2012 Chris Leonello
*
* jsDate is currently available for use in all personal or commercial projects
* under both the MIT and GPL version 2.0 licenses. This means that you can

80
js/jqplot/plugins/jqplot.categoryAxisRenderer.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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
@ -70,6 +70,7 @@
this._groupLabels = [];
this._grouped = false;
this._barsPerGroup = null;
this.reverse = false;
// prop: tickRenderer
// A class of a rendering engine for creating the ticks labels displayed on the plot,
// See <$.jqplot.AxisTickRenderer>.
@ -441,32 +442,67 @@
var pixellength = offmax - offmin;
var unitlength = max - min;
// point to unit and unit to point conversions references to Plot DOM element top left corner.
this.p2u = function(p){
return (p - offmin) * unitlength / pixellength + min;
};
this.u2p = function(u){
return (u - min) * pixellength / unitlength + offmin;
};
if (this.name == 'xaxis' || this.name == 'x2axis'){
this.series_u2p = function(u){
return (u - min) * pixellength / unitlength;
if (!this.reverse) {
// point to unit and unit to point conversions references to Plot DOM element top left corner.
this.u2p = function(u){
return (u - min) * pixellength / unitlength + offmin;
};
this.series_p2u = function(p){
return p * unitlength / pixellength + min;
this.p2u = function(p){
return (p - offmin) * unitlength / pixellength + min;
};
if (this.name == 'xaxis' || this.name == 'x2axis'){
this.series_u2p = function(u){
return (u - min) * pixellength / unitlength;
};
this.series_p2u = function(p){
return p * unitlength / pixellength + min;
};
}
else {
this.series_u2p = function(u){
return (u - max) * pixellength / unitlength;
};
this.series_p2u = function(p){
return p * unitlength / pixellength + max;
};
}
}
else {
this.series_u2p = function(u){
return (u - max) * pixellength / unitlength;
// point to unit and unit to point conversions references to Plot DOM element top left corner.
this.u2p = function(u){
return offmin + (max - u) * pixellength / unitlength;
};
this.series_p2u = function(p){
return p * unitlength / pixellength + max;
this.p2u = function(p){
return min + (p - offmin) * unitlength / pixellength;
};
if (this.name == 'xaxis' || this.name == 'x2axis'){
this.series_u2p = function(u){
return (max - u) * pixellength / unitlength;
};
this.series_p2u = function(p){
return p * unitlength / pixellength + max;
};
}
else {
this.series_u2p = function(u){
return (min - u) * pixellength / unitlength;
};
this.series_p2u = function(p){
return p * unitlength / pixellength + min;
};
}
}
if (this.show) {
if (this.name == 'xaxis' || this.name == 'x2axis') {

6
js/jqplot/plugins/jqplot.cursor.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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

43
js/jqplot/plugins/jqplot.dateAxisRenderer.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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
@ -335,28 +335,6 @@
var threshold = 30;
var insetMult = 1;
var daTickInterval = null;
// if user specified a tick interval, convert to usable.
if (this.tickInterval != null)
{
// if interval is a number or can be converted to one, use it.
// Assume it is in SECONDS!!!
if (Number(this.tickInterval)) {
daTickInterval = [Number(this.tickInterval), 'seconds'];
}
// else, parse out something we can build from.
else if (typeof this.tickInterval == "string") {
var parts = this.tickInterval.split(' ');
if (parts.length == 1) {
daTickInterval = [1, parts[0]];
}
else if (parts.length == 2) {
daTickInterval = [parts[0], parts[1]];
}
}
}
var tickInterval = this.tickInterval;
// if we already have ticks, use them.
@ -486,7 +464,7 @@
// tickInterval will be used before numberTicks, that is if
// both are specified, numberTicks will be ignored.
else if (this.tickInterval) {
titarget = new $.jsDate(0).add(daTickInterval[0], daTickInterval[1]).getTime();
titarget = this.tickInterval;
}
// if numberTicks specified, try to honor it.
@ -502,10 +480,9 @@
var tempti = ret[0];
this._autoFormatString = ret[1];
//min = Math.floor(min/tempti) * tempti;
min = Math.floor(min/tempti) * tempti;
min = new $.jsDate(min);
//min = min.getTime() + min.getUtcOffset();
min = Math.floor((min.getTime() - min.getUtcOffset())/tempti) * tempti + min.getUtcOffset();
min = min.getTime() + min.getUtcOffset();
nttarget = Math.ceil((max - min) / tempti) + 1;
this.min = min;
@ -663,7 +640,7 @@ min = Math.floor((min.getTime() - min.getUtcOffset())/tempti) * tempti + min.get
this.tickInterval = null;
}
/* // if user specified a tick interval, convert to usable.
// if user specified a tick interval, convert to usable.
if (this.tickInterval != null)
{
// if interval is a number or can be converted to one, use it.
@ -681,12 +658,8 @@ min = Math.floor((min.getTime() - min.getUtcOffset())/tempti) * tempti + min.get
this.daTickInterval = [parts[0], parts[1]];
}
}
}*/
}
if (this.tickInterval != null && daTickInterval != null) {
this.daTickInterval = daTickInterval;
}
// if min and max are same, space them out a bit
if (min == max) {
var adj = 24*60*60*500; // 1/2 day

6
js/jqplot/plugins/jqplot.highlighter.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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

6
js/jqplot/plugins/jqplot.pieRenderer.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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

6
js/jqplot/plugins/jqplot.pointLabels.js
View File

@ -2,10 +2,10 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.2
* Revision: 1108
* Version: 1.0.4
* Revision: 1121
*
* Copyright (c) 2009-2011 Chris Leonello
* Copyright (c) 2009-2012 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