Author: echatellier Date: 2013-07-19 23:51:14 +0200 (Fri, 19 Jul 2013) New Revision: 167 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/167 Log: Update jqplot Removed: sandbox/nuiton-js-jqplot/changelog.txt Modified: sandbox/nuiton-js-jqplot/LICENSE.txt sandbox/nuiton-js-jqplot/README.txt sandbox/nuiton-js-jqplot/generate-plugin-group.sh sandbox/nuiton-js-jqplot/pom.xml sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/excanvas.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm sandbox/nuiton-js-jqplot/src/site/site_en.xml Property changes on: sandbox/nuiton-js-jqplot/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/README.txt =================================================================== (Binary files differ) Property changes on: sandbox/nuiton-js-jqplot/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: sandbox/nuiton-js-jqplot/changelog.txt =================================================================== --- sandbox/nuiton-js-jqplot/changelog.txt 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/changelog.txt 2013-07-19 21:51:14 UTC (rev 167) @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-js/changes-report.html Property changes on: sandbox/nuiton-js-jqplot/generate-plugin-group.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/pom.xml =================================================================== (Binary files differ) Property changes on: sandbox/nuiton-js-jqplot/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml 2013-07-19 21:51:14 UTC (rev 167) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: jqPlot - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/excanvas.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css 2013-07-19 21:51:14 UTC (rev 167) @@ -1,5 +1,5 @@ -/*%%Ignore-License - rules for the plot target div. These will be cascaded down to all plot elements according to css rules*/ +/*%%Ignore-License +rules for the plot target div. These will be cascaded down to all plot elements according to css rules*/ .jqplot-target { position: relative; color: #666666; @@ -63,12 +63,12 @@ } .jqplot-yaxis-tick.jqplot-breakTick { - right: -20px; - margin-right: 0px; - padding:1px 5px 1px 5px; -/* background-color: white;*/ - z-index: 2; - font-size: 1.5em; + right: -20px; + margin-right: 0px; + padding:1px 5px 1px 5px; + /*background-color: white;*/ + z-index: 2; + font-size: 1.5em; } .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick { @@ -255,6 +255,6 @@ } div.jqplot-noData-container { - text-align: center; - background-color: rgba(96%, 96%, 96%, 0.3); + text-align: center; + background-color: rgba(96%, 96%, 96%, 0.3); } Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js 2013-07-19 21:51:14 UTC (rev 167) @@ -5,12 +5,12 @@ * * About: Version * - * version: 1.0.4 - * revision: 1121 + * version: 1.0.8 + * revision: 1250 * * About: Copyright & License * - * Copyright (c) 2009-2012 Chris Leonello + * Copyright (c) 2009-2013 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.4"; - $.jqplot.revision = "1121"; + $.jqplot.version = "1.0.8"; + $.jqplot.revision = "1250"; $.jqplot.targetCounter = 1; @@ -395,7 +395,7 @@ return $.jqplot.support_canvas_text.result; }; - $.jqplot.use_excanvas = ($.browser.msie && !$.jqplot.support_canvas()) ? true : false; + $.jqplot.use_excanvas = ((!$.support.boxModel || !$.support.objectAll || !$support.leadingWhitespace) && !$.jqplot.support_canvas()) ? true : false; /** * @@ -511,7 +511,7 @@ /** * Class: Axis * An individual axis object. Cannot be instantiated directly, but created - * by the Plot oject. Axis properties can be set or overriden by the + * by the Plot object. Axis properties can be set or overridden by the * options passed in from the user. * */ @@ -848,7 +848,7 @@ /** * Class: Legend * Legend object. Cannot be instantiated directly, but created - * by the Plot oject. Legend properties can be set or overriden by the + * by the Plot object. Legend properties can be set or overridden by the * options passed in from the user. */ function Legend(options) { @@ -1077,7 +1077,7 @@ /** * Class: Title * Plot Title object. Cannot be instantiated directly, but created - * by the Plot oject. Title properties can be set or overriden by the + * by the Plot object. Title properties can be set or overridden by the * options passed in from the user. * * Parameters: @@ -1091,7 +1091,7 @@ // text of the title; this.text = text; // prop: show - // wether or not to show the title + // whether or not to show the title this.show = true; // prop: fontFamily // css font-family spec for the text. @@ -1140,7 +1140,7 @@ /** * Class: Series * An individual data series object. Cannot be instantiated directly, but created - * by the Plot oject. Series properties can be set or overriden by the + * by the Plot object. Series properties can be set or overridden by the * options passed in from the user. */ function Series(options) { @@ -1159,7 +1159,7 @@ // > } // prop: show - // wether or not to draw the series. + // whether or not to draw the series. this.show = true; // prop: xaxis // which x axis to use with this series, either 'xaxis' or 'x2axis'. @@ -1233,16 +1233,16 @@ // see <$.jqplot.MarkerRenderer>. this.markerOptions = {}; // prop: showLine - // wether to actually draw the line or not. Series will still be renderered, even if no line is drawn. + // whether to actually draw the line or not. Series will still be renderered, even if no line is drawn. this.showLine = true; // prop: showMarker - // wether or not to show the markers at the data points. + // whether or not to show the markers at the data points. this.showMarker = true; // prop: index // 0 based index of this series in the plot series array. this.index; // prop: fill - // true or false, wether to fill under lines or in bars. + // true or false, whether to fill under lines or in bars. // May not be implemented in all renderers. this.fill = false; // prop: fillColor @@ -1369,7 +1369,7 @@ this.markerOptions.show = this.showMarker; } this.showMarker = this.markerOptions.show; - // the markerRenderer is called within it's own scaope, don't want to overwrite series options!! + // the markerRenderer is called within its own scope, don't want to overwrite series options!! this.markerRenderer.init(this.markerOptions); }; @@ -1524,15 +1524,15 @@ * Object representing the grid on which the plot is drawn. The grid in this * context is the area bounded by the axes, the area which will contain the series. * Note, the series are drawn on their own canvas. - * The Grid object cannot be instantiated directly, but is created by the Plot oject. - * Grid properties can be set or overriden by the options passed in from the user. + * The Grid object cannot be instantiated directly, but is created by the Plot object. + * Grid properties can be set or overridden by the options passed in from the user. */ function Grid() { $.jqplot.ElemContainer.call(this); // Group: Properties // prop: drawGridlines - // wether to draw the gridlines on the plot. + // whether to draw the gridlines on the plot. this.drawGridlines = true; // prop: gridLineColor // color of the grid lines. @@ -1553,7 +1553,7 @@ // True to draw border around grid. this.drawBorder = true; // prop: shadow - // wether to show a shadow behind the grid. + // whether to show a shadow behind the grid. this.shadow = true; // prop: shadowAngle // shadow angle in degrees @@ -1741,7 +1741,7 @@ // animation in these situations can cause problems. this.animateReplot = false; // prop: axes - // up to 4 axes are supported, each with it's own options, + // up to 4 axes are supported, each with its own options, // See <Axis> for axis specific options. this.axes = {xaxis: new Axis('xaxis'), yaxis: new Axis('yaxis'), x2axis: new Axis('x2axis'), y2axis: new Axis('y2axis'), y3axis: new Axis('y3axis'), y4axis: new Axis('y4axis'), y5axis: new Axis('y5axis'), y6axis: new Axis('y6axis'), y7axis: new Axis('y7axis'), y8axis: new Axis('y8axis'), y9axis: new Axis('y9axis'), yMidAxis: new Axis('yMidAxis')}; this.baseCanvas = new $.jqplot.GenericCanvas(); @@ -1757,7 +1757,8 @@ this.data = []; // prop: dataRenderer // A callable which can be used to preprocess data passed into the plot. - // Will be called with 2 arguments, the plot data and a reference to the plot. + // Will be called with 3 arguments: the plot data, a reference to the plot, + // and the value of dataRendererOptions. this.dataRenderer; // prop: dataRendererOptions // Options that will be passed to the dataRenderer. @@ -1820,7 +1821,6 @@ this.legend = new Legend(); // prop: noDataIndicator // Options to set up a mock plot with a data loading indicator if no data is specified. - this.negativeSeriesColors = $.jqplot.config.defaultNegativeColors; this.noDataIndicator = { show: false, indicator: 'Loading Data...', @@ -1839,16 +1839,19 @@ } } }; + // prop: negativeSeriesColors + // colors to use for portions of the line below zero. + this.negativeSeriesColors = $.jqplot.config.defaultNegativeColors; // container to hold all of the merged options. Convienence for plugins. this.options = {}; this.previousSeriesStack = []; - // Namespece to hold plugins. Generally non-renderer plugins add themselves to here. + // Namespace to hold plugins. Generally non-renderer plugins add themselves to here. this.plugins = {}; // prop: series // Array of series object options. // see <Series> for series specific options. this.series = []; - // array of series indicies. Keep track of order + // array of series indices. Keep track of order // which series canvases are displayed, lowest // to highest, back to front. this.seriesStack = []; @@ -1860,7 +1863,7 @@ this.seriesColors = $.jqplot.config.defaultColors; // prop: sortData // false to not sort the data passed in by the user. - // Many bar, stakced and other graphs as well as many plugins depend on + // Many bar, stacked and other graphs as well as many plugins depend on // having sorted data. this.sortData = true; // prop: stackSeries @@ -1887,7 +1890,7 @@ // Mostly used to test if plot has never been dran (=0), has been successfully drawn // into a visible container once (=1) or draw more than once into a visible container. // Can use this in tests to see if plot has been visibly drawn at least one time. - // After plot has been visibly drawn once, it generally doesn't need redrawn if its + // After plot has been visibly drawn once, it generally doesn't need redrawing if its // container is hidden and shown. this._drawCount = 0; // sum of y values for all series in plot. @@ -1963,7 +1966,7 @@ // remove any error class that may be stuck on target. this.target.removeClass('jqplot-error'); if (!this.target.get(0)) { - throw "No plot target specified"; + throw new Error("No plot target specified"); } // make sure the target is positioned by some means and set css @@ -2022,7 +2025,7 @@ this.eventCanvas._plotDimensions = this._plotDimensions; this.legend._plotDimensions = this._plotDimensions; if (this._height <=0 || this._width <=0 || !this._height || !this._width) { - throw "Canvas dimension not set"; + throw new Error("Canvas dimension not set"); } if (options.dataRenderer && $.isFunction(options.dataRenderer)) { @@ -2040,7 +2043,7 @@ if (data == null || $.isArray(data) == false || data.length == 0 || $.isArray(data[0]) == false || data[0].length == 0) { if (this.noDataIndicator.show == false) { - throw "No Data"; + throw new Error("No data specified"); } else { @@ -2205,7 +2208,7 @@ this._width = this.target.width(); if (this._height <=0 || this._width <=0 || !this._height || !this._width) { - throw "Target dimension not set"; + throw new Error("Target dimension not set"); } this._plotDimensions.height = this._height; @@ -2361,7 +2364,7 @@ this._width = this.target.width(); if (this._height <=0 || this._width <=0 || !this._height || !this._width) { - throw "Target dimension not set"; + throw new Error("Target dimension not set"); } this._plotDimensions.height = this._height; @@ -2924,7 +2927,7 @@ for (i=0, l=$.jqplot.preDrawHooks.length; i<l; i++) { $.jqplot.preDrawHooks[i].call(this); } - for (i=0, l=this.preDrawHooks.length; i<l; i++) { + for (i=0, l=this.preDrawHooks.hooks.length; i<l; i++) { this.preDrawHooks.hooks[i].apply(this, this.preDrawSeriesHooks.args[i]); } // create an underlying canvas to be used for special features. @@ -3296,7 +3299,7 @@ minang = (j>0) ? s.gridData[j-1][1]+sm : sm; maxang = s.gridData[j][1]; if (theta > minang && theta < maxang) { - return {seriesIndex:s.index, pointIndex:j, gridData:s.gridData[j], data:s.data[j]}; + return {seriesIndex:s.index, pointIndex:j, gridData:[gridpos.x,gridpos.y], data:s.data[j]}; } } } @@ -3341,7 +3344,7 @@ minang = (j>0) ? s.gridData[j-1][1]+sm : sm; maxang = s.gridData[j][1]; if (theta > minang && theta < maxang) { - return {seriesIndex:s.index, pointIndex:j, gridData:s.gridData[j], data:s.data[j]}; + return {seriesIndex:s.index, pointIndex:j, gridData:[gridpos.x,gridpos.y], data:s.data[j]}; } } } @@ -3906,7 +3909,7 @@ return $.jqplot.hex2rgb(s, a); } else { - throw 'invalid color spec'; + throw new Error('Invalid color spec'); } }; @@ -4082,6 +4085,7 @@ + // class: $.jqplot.AxisLabelRenderer // Renderer to place labels on the axes. $.jqplot.AxisLabelRenderer = function(options) { @@ -4090,7 +4094,7 @@ // name of the axis associated with this tick this.axis; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). this.show = true; // prop: label // The text or html for the label. @@ -4159,10 +4163,10 @@ // name of the axis associated with this tick this.axis; // prop: showMark - // wether or not to show the mark on the axis. + // whether or not to show the mark on the axis. this.showMark = true; // prop: showGridline - // wether or not to draw the gridline on the grid at this tick. + // whether or not to draw the gridline on the grid at this tick. this.showGridline = true; // prop: isMinorTick // if this is a minor tick. @@ -4176,12 +4180,12 @@ // will be stoked above and below axis, so total length will be twice this. this.markSize = 6; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). // Setting this to false requires more testing. It is recommended // to set showLabel and showMark to false instead. this.show = true; // prop: showLabel - // wether or not to show the label. + // whether or not to show the label. this.showLabel = true; this.label = null; this.value = null; @@ -4213,7 +4217,7 @@ // true to escape HTML entities in the label. this.escapeHTML = false; this._elem; - this._breakTick = false; + this._breakTick = false; $.extend(true, this, options); }; @@ -4273,9 +4277,9 @@ if (this.textColor) { this._elem.css('color', this.textColor); } - if (this._breakTick) { - this._elem.addClass('jqplot-breakTick'); - } + if (this._breakTick) { + this._elem.addClass('jqplot-breakTick'); + } return this._elem; }; @@ -4349,8 +4353,8 @@ this._elem.addClass('jqplot-grid-canvas'); this._elem.css({ position: 'absolute', left: 0, top: 0 }); - elem = plot.canvasManager.initCanvas(elem); - + elem = plot.canvasManager.initCanvas(elem); + this._top = this._offsets.top; this._bottom = h - this._offsets.bottom; this._left = this._offsets.left; @@ -4754,11 +4758,11 @@ $.jqplot.LinePattern = function (ctx, pattern) { - var defaultLinePatterns = { - dotted: [ dotlen, $.jqplot.config.dotGapLength ], - dashed: [ $.jqplot.config.dashLength, $.jqplot.config.gapLength ], - solid: null - }; + var defaultLinePatterns = { + dotted: [ dotlen, $.jqplot.config.dotGapLength ], + dashed: [ $.jqplot.config.dashLength, $.jqplot.config.gapLength ], + solid: null + }; if (typeof pattern === 'string') { if (pattern[0] === '.' || pattern[0] === '-') { @@ -5732,7 +5736,7 @@ tempgd.push(gd[i]); this._areaPoints.push(gd[i]); // do we have an axis crossing? - if (pd[i][1] * pd[i+1][1] < 0) { + if (pd[i][1] * pd[i+1][1] <= 0) { if (pd[i][1] < 0) { isnegative = true; opts.fillStyle = negativeColor; @@ -5992,7 +5996,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.lineRenderer.highlightedSeriesIndex)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6009,7 +6013,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.lineRenderer.highlightedSeriesIndex)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6032,7 +6036,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6047,7 +6051,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -6142,7 +6146,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this, plot); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; @@ -7399,7 +7403,7 @@ // Group: Properties // prop: show - // wether or not to show the marker. + // whether or not to show the marker. this.show = true; // prop: style // One of diamond, circle, square, x, plus, dash, filledDiamond, filledCircle, filledSquare @@ -7414,7 +7418,7 @@ // color of marker. Will be set to color of series by default on init. this.color = '#666666'; // prop: shadow - // wether or not to draw a shadow on the line + // whether or not to draw a shadow on the line this.shadow = true; // prop: shadowAngle // Shadow angle in degrees @@ -7625,7 +7629,7 @@ this.depth = 3; this.strokeStyle = 'rgba(0,0,0,0.1)'; // prop: isarc - // wether the shadow is an arc or not. + // whether the shadow is an arc or not. this.isarc = false; $.extend(true, this, options); @@ -7727,7 +7731,7 @@ // whether to fill the shape. this.fill = false; // prop: isarc - // wether the shadow is an arc or not. + // whether the shadow is an arc or not. this.isarc = false; // prop: fillRect // true to draw shape as a filled rectangle. @@ -7950,7 +7954,7 @@ var pad = false, reverse = false, - s; + s; for (var i = 0; i< series.length; i++) { s = series[i]; if (s._stack || s.renderer.constructor == $.jqplot.BezierCurveRenderer){ @@ -9283,7 +9287,7 @@ return str; }; - // Not gauranteed to work, even on canvas supporting browsers due to + // Not guaranteed to work, even on canvas supporting browsers due to // limitations with location.href and browser support. $.fn.jqplotSaveImage = function() { var imgData = $(this).jqplotToImageStr({}); @@ -9293,7 +9297,7 @@ }; - // Not gauranteed to work, even on canvas supporting browsers due to + // Not guaranteed to work, even on canvas supporting browsers due to // limitations with window.open and arbitrary data. $.fn.jqplotViewImage = function() { var imgStr = $(this).jqplotToImageElemStr({}); @@ -9323,12 +9327,12 @@ * @author Chris Leonello * @date #date# * @version #VERSION# - * @copyright (c) 2010 Chris Leonello + * @copyright (c) 2010-2013 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 * choose the license that best suits your project and use it accordingly. * - * <p>Ken's origianl Date Instance Methods and copyright notice:</p> + * <p>Ken's original Date Instance Methods and copyright notice:</p> * <pre> * Ken Snyder (ken d snyder at gmail dot com) * 2008-09-10 @@ -9616,7 +9620,7 @@ jsDate.prototype.getIsoWeek = function() { var d = this.proxy; - var woy = d.getWeekOfYear(); + var woy = this.getWeekOfYear(); var dow1_1 = (new Date('' + d.getFullYear() + '/1/1')).getDay(); // First week is 01 and not 00 as in the case of %U and %W, // so we add 1 to the final result except if day 1 of the year @@ -10010,8 +10014,31 @@ dayNames: ['Domingo','Segunda-feira','Terça-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sábado'], dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'], formatString: '%Y-%m-%d %H:%M:%S' + }, + + 'pl': { + monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec','Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'], + monthNamesShort: ['Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze','Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'], + dayNames: ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'], + dayNamesShort: ['Ni', 'Pn', 'Wt', 'Śr', 'Cz', 'Pt', 'Sb'], + formatString: '%Y-%m-%d %H:%M:%S' + }, + + 'nl': { + monthNames: ['Januari','Februari','Maart','April','Mei','Juni','July','Augustus','September','Oktober','November','December'], + monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun','Jul','Aug','Sep','Okt','Nov','Dec'], + dayNames:','['Zondag','Maandag','Dinsdag','Woensdag','Donderdag','Vrijdag','Zaterdag'], + dayNamesShort: ['Zo','Ma','Di','Wo','Do','Vr','Za'], + formatString: '%Y-%m-%d %H:%M:%S' + }, + + 'sv': { + monthNames: ['januari','februari','mars','april','maj','juni','juli','augusti','september','oktober','november','december'], + monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'], + dayNames: ['söndag','måndag','tisdag','onsdag','torsdag','fredag','lördag'], + dayNamesShort: ['sön','mån','tis','ons','tor','fre','lör'], + formatString: '%Y-%m-%d %H:%M:%S' } - }; @@ -10976,15 +11003,18 @@ var method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())]; var textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2]; var number_str = Math.abs(number)[method](precision); - number_str = thousandSeparation ? thousand_separate(number_str): number_str; + + // Apply the decimal mark properly by splitting the number by the + // decimalMark, applying thousands separator, and then placing it + // back in. + var parts = number_str.toString().split('.'); + parts[0] = thousandSeparation ? thousand_separate(parts[0]) : parts[0]; + number_str = parts.join($.jqplot.sprintf.decimalMark); + value = prefix + number_str; var justified = justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace)[textTransform](); - - if ($.jqplot.sprintf.decimalMark !== '.' && $.jqplot.sprintf.decimalMark !== $.jqplot.sprintf.thousandsSeparator) { - return justified.replace(/\./, $.jqplot.sprintf.decimalMark); - } else { - return justified; - } + + return justified; } case 'p': case 'P': @@ -10997,7 +11027,7 @@ var prefix = number < 0 ? '-' : positivePrefix; var parts = String(Number(Math.abs(number)).toExponential()).split(/e|E/); - var sd = (parts[0].indexOf('.') != -1) ? parts[0].length - 1 : parts[0].length; + var sd = (parts[0].indexOf('.') != -1) ? parts[0].length - 1 : String(number).length; var zeros = (parts[1] < 0) ? -parts[1] - 1 : 0; if (Math.abs(number) < 1) { @@ -11053,7 +11083,7 @@ return $.jqplot.getSignificantFigures(number).digitsRight; }; -})(jQuery); + var backCompat = $.uiBackCompat !== false; @@ -11378,4 +11408,4 @@ }; - +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/jquery.jqplot.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -289,6 +289,7 @@ function preInit(target, data, options) { options = options || {}; options.axesDefaults = $.extend(true, {pad:0}, options.axesDefaults); + options.seriesDefaults = options.seriesDefaults || {}; options.legend = $.extend(true, {placement:'outside'}, options.legend); // only set these if there is a pie series var setopts = false; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -115,7 +115,7 @@ ////// // This is probably wrong here. - // After going back and forth on wether renderer should be the thing + // After going back and forth on whether renderer should be the thing // or extend the thing, it seems that it it best if it is a property // on the thing. This should be something that is commonized // among series renderers in the future. @@ -350,7 +350,7 @@ var nvals = temp[0]; var nseries = temp[1]; var pos = temp[2]; - var points = []; + var points = []; if (this._stack) { this._barNudge = 0; @@ -366,9 +366,9 @@ negativeColor = opts.fillStyle; } var positiveColor = opts.fillStyle; - var base; - var xstart; - var ystart; + var base; + var xstart; + var ystart; if (this.barDirection == 'vertical') { for (var i=0; i<gridData.length; i++) { @@ -438,20 +438,20 @@ opts.fillStyle = positiveColor; } } - - if (!this.fillToZero || this._plotData[i][1] >= 0) { - points.push([base-this.barWidth/2, ystart]); - points.push([base-this.barWidth/2, gridData[i][1]]); - points.push([base+this.barWidth/2, gridData[i][1]]); - points.push([base+this.barWidth/2, ystart]); - } - // for negative bars make sure points are always ordered clockwise - else { - points.push([base-this.barWidth/2, gridData[i][1]]); - points.push([base-this.barWidth/2, ystart]); - points.push([base+this.barWidth/2, ystart]); - points.push([base+this.barWidth/2, gridData[i][1]]); - } + + if (!this.fillToZero || this._plotData[i][1] >= 0) { + points.push([base-this.barWidth/2, ystart]); + points.push([base-this.barWidth/2, gridData[i][1]]); + points.push([base+this.barWidth/2, gridData[i][1]]); + points.push([base+this.barWidth/2, ystart]); + } + // for negative bars make sure points are always ordered clockwise + else { + points.push([base-this.barWidth/2, gridData[i][1]]); + points.push([base-this.barWidth/2, ystart]); + points.push([base+this.barWidth/2, ystart]); + points.push([base+this.barWidth/2, gridData[i][1]]); + } this._barPoints.push(points); // now draw the shadows if not stacked. // for stacked plots, they are predrawn by drawShadow @@ -513,7 +513,7 @@ xstart = 0; } } - if ((this.fillToZero && this._plotData[i][1] < 0) || (this.waterfall && this._data[i][1] < 0)) { + if ((this.fillToZero && this._plotData[i][0] < 0) || (this.waterfall && this._data[i][0] < 0)) { if (this.varyBarColor && !this._stack) { if (this.useNegativeColors) { opts.fillStyle = negativeColors.next(); @@ -522,6 +522,9 @@ opts.fillStyle = positiveColors.next(); } } + else { + opts.fillStyle = negativeColor; + } } else { if (this.varyBarColor && !this._stack) { @@ -729,9 +732,10 @@ evt1.pageX = ev.pageX; evt1.pageY = ev.pageY; plot.target.trigger(evt1, ins); - if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { + if (plot.series[ins[0]].show && plot.series[ins[0]].highlightMouseOver && + !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -748,7 +752,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -771,7 +775,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -786,7 +790,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -794,4 +798,4 @@ } -})(jQuery); \ No newline at end of file +})(jQuery); \ No newline at end of file Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -632,7 +632,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.bubbleRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -651,7 +651,7 @@ var ins = [si, pi, neighbor.data, plot.series[si].gridData[pi][2]]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.bubbleRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -676,7 +676,7 @@ var pi = neighbor.pointIndex; var ins = [si, pi, neighbor.data, plot.series[si].gridData[pi][2]]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -693,7 +693,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -52,10 +52,10 @@ // name of the axis associated with this tick this.axis; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). this.show = true; // prop: showLabel - // wether or not to show the label. + // whether or not to show the label. this.showLabel = true; // prop: label // label for the axis. @@ -186,8 +186,8 @@ elem.style.width = w; elem.style.height = h; - elem = plot.canvasManager.initCanvas(elem); - + elem = plot.canvasManager.initCanvas(elem); + this._elem = $(elem); this._elem.css({ position: 'absolute'}); this._elem.addClass('jqplot-'+this.axis+'-label'); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -49,10 +49,10 @@ // tick mark on the axis. One of 'inside', 'outside', 'cross', '' or null. this.mark = 'outside'; // prop: showMark - // wether or not to show the mark on the axis. + // whether or not to show the mark on the axis. this.showMark = true; // prop: showGridline - // wether or not to draw the gridline on the grid at this tick. + // whether or not to draw the gridline on the grid at this tick. this.showGridline = true; // prop: isMinorTick // if this is a minor tick. @@ -65,10 +65,10 @@ // will be stoked above and below axis, so total length will be twice this. this.markSize = 4; // prop: show - // wether or not to show the tick (mark and label). + // whether or not to show the tick (mark and label). this.show = true; // prop: showLabel - // wether or not to show the label. + // whether or not to show the label. this.showLabel = true; // prop: labelPosition // 'auto', 'start', 'middle' or 'end'. @@ -180,6 +180,16 @@ return w; } }; + + // return top. + $.jqplot.CanvasAxisTickRenderer.prototype.getTop = function(ctx) { + if (this._elem) { + return this._elem.position().top; + } + else { + return null; + } + }; $.jqplot.CanvasAxisTickRenderer.prototype.getAngleRad = function() { var a = this.angle * Math.PI/180; @@ -225,13 +235,13 @@ elem.style.height = h; elem.style.textAlign = 'left'; elem.style.position = 'absolute'; - - elem = plot.canvasManager.initCanvas(elem); - + + elem = plot.canvasManager.initCanvas(elem); + this._elem = $(elem); this._elem.css(this._styles); this._elem.addClass('jqplot-'+this.axis+'-tick'); - + elem = null; return this._elem; }; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -66,6 +66,9 @@ case 'dashedVerticalLine': this.addDashedVerticalLine(obj[n]); break; + case 'rectangle': + this.addRectangle(obj[n]); + break; default: break; } @@ -107,7 +110,7 @@ // color of the line color: '#666666', // prop: shadow - // wether or not to draw a shadow on the line + // whether or not to draw a shadow on the line shadow: true, // prop: shadowAngle // Shadow angle in degrees @@ -153,7 +156,41 @@ tooltipFormatString: '%d, %d' }; } + + + function Rectangle(options) { + LineBase.call(this); + this.type = 'rectangle'; + var opts = { + // prop: xmin + // x value for the start of the line, null to scale to axis min. + xmin: null, + // prop: xmax + // x value for the end of the line, null to scale to axis max. + xmax: null, + // prop xOffset + // offset ends of the line inside the grid. Number + xOffset: '6px', // number or string. Number interpreted as units, string as pixels. + xminOffset: null, + xmaxOffset: null, + + ymin: null, + ymax: null, + yOffset: '6px', // number or string. Number interpreted as units, string as pixels. + yminOffset: null, + ymaxOffset: null + }; + $.extend(true, this.options, opts, options); + if (this.options.showTooltipPrecision < 0.01) { + this.options.showTooltipPrecision = 0.01; + } + } + + Rectangle.prototype = new LineBase(); + Rectangle.prototype.constructor = Rectangle; + + /** * Class: Line * A straight line. @@ -338,6 +375,13 @@ this.objectNames.push(line.options.name); }; + $.jqplot.CanvasOverlay.prototype.addRectangle = function(opts) { + var line = new Rectangle(opts); + line.uid = objCounter++; + this.objects.push(line); + this.objectNames.push(line.options.name); + }; + $.jqplot.CanvasOverlay.prototype.removeObject = function(idx) { // check if integer, remove by index if ($.type(idx) == 'number') { @@ -621,7 +665,81 @@ } } break; + + case 'rectangle': + // style and shadow properties should be set before + // every draw of marker renderer. + mr.style = 'line'; + opts.closePath = true; + + var xaxis = plot.axes[obj.options.xaxis], + xstart, + xstop, + y = plot.axes[obj.options.yaxis].series_u2p(obj.options.y), + xminoff = obj.options.xminOffset || obj.options.xOffset, + xmaxoff = obj.options.xmaxOffset || obj.options.xOffset; + if (obj.options.xmin != null) { + xstart = xaxis.series_u2p(obj.options.xmin); + } + else if (xminoff != null) { + if ($.type(xminoff) == "number") { + xstart = xaxis.series_u2p(xaxis.min + xminoff); + } + else if ($.type(xminoff) == "string") { + xstart = xaxis.series_u2p(xaxis.min) + parseFloat(xminoff); + } + } + if (obj.options.xmax != null) { + xstop = xaxis.series_u2p(obj.options.xmax); + } + else if (xmaxoff != null) { + if ($.type(xmaxoff) == "number") { + xstop = xaxis.series_u2p(xaxis.max - xmaxoff); + } + else if ($.type(xmaxoff) == "string") { + xstop = xaxis.series_u2p(xaxis.max) - parseFloat(xmaxoff); + } + } + + var yaxis = plot.axes[obj.options.yaxis], + ystart, + ystop, + x = plot.axes[obj.options.xaxis].series_u2p(obj.options.x), + yminoff = obj.options.yminOffset || obj.options.yOffset, + ymaxoff = obj.options.ymaxOffset || obj.options.yOffset; + if (obj.options.ymin != null) { + ystart = yaxis.series_u2p(obj.options.ymin); + } + else if (yminoff != null) { + if ($.type(yminoff) == "number") { + ystart = yaxis.series_u2p(yaxis.min - yminoff); + } + else if ($.type(yminoff) == "string") { + ystart = yaxis.series_u2p(yaxis.min) - parseFloat(yminoff); + } + } + if (obj.options.ymax != null) { + ystop = yaxis.series_u2p(obj.options.ymax); + } + else if (ymaxoff != null) { + if ($.type(ymaxoff) == "number") { + ystop = yaxis.series_u2p(yaxis.max + ymaxoff); + } + else if ($.type(ymaxoff) == "string") { + ystop = yaxis.series_u2p(yaxis.max) + parseFloat(ymaxoff); + } + } + + if (xstop != null && xstart != null && ystop != null && ystart != null) { + obj.gridStart = [xstart, ystart]; + obj.gridStop = [xstop, ystop]; + + this.canvas._ctx.fillStyle = obj.options.color; + this.canvas._ctx.fillRect(xstart, ystart, xstop - xstart, ystop - ystart); + } + break; + default: break; } @@ -738,6 +856,24 @@ var ret = (res < eps) ? true : false; return ret; } + + function isNearRectangle(point, lstart, lstop, width) { + // r is point to test, p and q are end points. + var rx = point[0]; + var ry = point[1]; + var px = Math.round(lstop[0]); + var py = Math.round(lstop[1]); + var qx = Math.round(lstart[0]); + var qy = Math.round(lstart[1]); + + var temp; + if (px > qx) { temp = px; px = qx; qx = temp; } + if (py > qy) { temp = py; py = qy; qy = temp; } + + var ret = (rx >= px && rx <= qx && ry >= py && ry <= qy); + + return ret; + } function handleMove(ev, gridpos, datapos, neighbor, plot) { @@ -749,7 +885,12 @@ for (var i=0; i<l; i++) { obj = objs[i]; if (obj.options.showTooltip) { - var n = isNearLine([gridpos.x, gridpos.y], obj.gridStart, obj.gridStop, obj.tooltipWidthFactor); + var n; + if (obj.type === 'rectangle') { + n = isNearRectangle([gridpos.x, gridpos.y], obj.gridStart, obj.gridStop, obj.tooltipWidthFactor); + } else { + n = isNearLine([gridpos.x, gridpos.y], obj.gridStart, obj.gridStop, obj.tooltipWidthFactor); + } datapos = [plot.axes[obj.options.xaxis].series_p2u(gridpos.x), plot.axes[obj.options.yaxis].series_p2u(gridpos.y)]; // cases: @@ -775,6 +916,11 @@ case 'dashedVerticalLine': showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); break; + + case 'rectangle': + showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); + break; + default: break; } @@ -809,6 +955,11 @@ case 'dashedVerticalLine': showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); break; + + case 'rectangle': + showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); + break; + default: break; } @@ -834,6 +985,11 @@ case 'dashedVerticalLine': showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); break; + + case 'rectangle': + showTooltip(plot, obj, [obj.gridStart[0], gridpos.y], [obj.options.x, datapos[1]]); + break; + default: break; } Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -29,7 +29,7 @@ * * included jsDate library by Chris Leonello: * - * Copyright (c) 2010-2012 Chris Leonello + * Copyright (c) 2010-2013 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 @@ -38,7 +38,7 @@ * jsDate borrows many concepts and ideas from the Date Instance * Methods by Ken Snyder along with some parts of Ken's actual code. * - * Ken's origianl Date Instance Methods and copyright notice: + * Ken's original Date Instance Methods and copyright notice: * * Ken Snyder (ken d snyder at gmail dot com) * 2008-09-10 Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -211,7 +211,11 @@ } if (isMerged && this.sortMergedLabels) { - labels.sort(function(a,b) { return a - b; }); + if (typeof labels[0] == "string") { + labels.sort(); + } else { + labels.sort(function(a,b) { return a - b; }); + } } // keep a reference to these tick labels to use for redrawing plot (see bug #57) @@ -306,7 +310,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; @@ -432,7 +436,7 @@ var offmin = offsets.min; var lshow = (this._label == null) ? false : this._label.show; var i; - + for (var p in pos) { this._elem.css(p, pos[p]); } @@ -564,11 +568,12 @@ } // draw the group labels - var step = parseInt(this._ticks.length/this.groups, 10); + var step = parseInt(this._ticks.length/this.groups, 10) + 1; for (i=0; i<this._groupLabels.length; i++) { var mid = 0; var count = 0; - for (var j=i*step; j<=(i+1)*step; j++) { + for (var j=i*step; j<(i+1)*step; j++) { + if (j >= this._ticks.length-1) continue; // the last tick does not exist as there is no other group in order to have an empty one. if (this._ticks[j]._elem && this._ticks[j].label != " ") { var t = this._ticks[j]._elem; var p = t.position(); @@ -648,11 +653,12 @@ } // draw the group labels, position top here, do left after label position. - var step = parseInt(this._ticks.length/this.groups, 10); + var step = parseInt(this._ticks.length/this.groups, 10) + 1; // step is one more than before as we don't want to have overlaps in loops for (i=0; i<this._groupLabels.length; i++) { var mid = 0; var count = 0; - for (var j=i*step; j<=(i+1)*step; j++) { + for (var j=i*step; j<(i+1)*step; j++) { // j must never reach (i+1)*step as we don't want to have overlap between loops + if (j >= this._ticks.length-1) continue; // the last tick does not exist as there is no other group in order to have an empty one. if (this._ticks[j]._elem && this._ticks[j].label != " ") { var t = this._ticks[j]._elem; var p = t.position(); @@ -670,4 +676,4 @@ }; -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -54,7 +54,7 @@ $.jqplot.ciParser = function (data, plot) { var ret = [], line, - temp, + temp, i, j, k, kk; if (typeof(data) == "string") { Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -42,7 +42,7 @@ this.style = 'crosshair'; this.previousCursor = 'auto'; // prop: show - // wether to show the cursor or not. + // whether to show the cursor or not. this.show = $.jqplot.config.enablePlugins; // prop: showTooltip // show a cursor position tooltip. Location of the tooltip @@ -654,7 +654,7 @@ elem.css('left', x); elem.css('top', y); - elem = null; + elem = null; } function positionTooltip(plot) { @@ -1048,7 +1048,7 @@ if (this.show) { var series = this._series, s; // make a table. one line label per row. - var elem = document.createElement('div'); + var elem = document.createElement('table'); this._elem = $(elem); elem = null; this._elem.addClass('jqplot-legend jqplot-cursor-legend'); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -33,7 +33,7 @@ * Class: $.jqplot.DateAxisRenderer * A plugin for a jqPlot to render an axis as a series of date values. * This renderer has no options beyond those supplied by the <Axis> class. - * It supplies it's own tick formatter, so the tickOptions.formatter option + * It supplies its own tick formatter, so the tickOptions.formatter option * should not be overridden. * * Thanks to Ken Synder for his enhanced Date instance methods which are @@ -334,14 +334,35 @@ var tt, i; 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. // ticks must be in order of increasing value. - min = ((this.min != null) ? new $.jsDate(this.min).getTime() : db.min); - max = ((this.max != null) ? new $.jsDate(this.max).getTime() : db.max); + min = new $.jsDate((this.min != null) ? this.min : db.min).getTime(); + max = new $.jsDate((this.max != null) ? this.max : db.max).getTime(); // see if we're zooming. if we are, don't use the min and max we're given, // but compute some nice ones. They will be reset later. @@ -459,16 +480,16 @@ } // If tickInterval is specified, we'll try to honor it. - // Not gauranteed to get this interval, but we'll get as close as + // Not guaranteed to get this interval, but we'll get as close as // we can. // tickInterval will be used before numberTicks, that is if // both are specified, numberTicks will be ignored. else if (this.tickInterval) { - titarget = this.tickInterval; + titarget = new $.jsDate(0).add(daTickInterval[0], daTickInterval[1]).getTime(); } // if numberTicks specified, try to honor it. - // Not gauranteed, but will try to get close. + // Not guaranteed, but will try to get close. else if (this.numberTicks) { nttarget = this.numberTicks; titarget = (max - min) / (nttarget - 1); @@ -480,9 +501,8 @@ var tempti = ret[0]; this._autoFormatString = ret[1]; - 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(); nttarget = Math.ceil((max - min) / tempti) + 1; this.min = min; @@ -640,24 +660,8 @@ this.tickInterval = 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)) { - this.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) { - this.daTickInterval = [1, parts[0]]; - } - else if (parts.length == 2) { - 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 Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -101,7 +101,7 @@ // null will compute ringMargin based on sliceMargin. this.ringMargin = null; // prop: fill - // true or false, wether to fil the slices. + // true or false, whether to fil the slices. this.fill = true; // prop: shadowOffset // offset of the shadow from the slice and offset of @@ -703,7 +703,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.donutRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -720,7 +720,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.donutRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -743,7 +743,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -758,7 +758,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -73,7 +73,7 @@ var legend = this; if (this.show) { var series = this._series; - var s; + var s; var ss = 'position:absolute;'; ss += (this.background) ? 'background:'+this.background+';' : ''; ss += (this.border) ? 'border:'+this.border+';' : ''; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -102,7 +102,7 @@ // spacing between funnel sections in pixels. this.sectionMargin = 6; // prop: fill - // true or false, wether to fill the areas. + // true or false, whether to fill the areas. this.fill = true; // prop: shadowOffset // offset of the shadow from the area and offset of @@ -841,7 +841,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.funnelRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -858,7 +858,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.funnelRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -881,7 +881,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -896,7 +896,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -44,7 +44,7 @@ * To disable the tooltip, set "showTooltip" to false. * * You can control what data is displayed in the tooltip with various - * options. The "tooltipAxes" option controls wether the x, y or both + * options. The "tooltipAxes" option controls whether the x, y or both * data values are displayed. * * Some chart types (e.g. hi-low-close) have more than one y value per @@ -339,12 +339,12 @@ if (series.markerRenderer.show == true) { ms = (series.markerRenderer.size + opts.sizeAdjust)/2; } - - var loc = locations; - if (series.fillToZero && series.fill && neighbor.data[1] < 0) { - loc = oppositeLocations; - } - + + var loc = locations; + if (series.fillToZero && series.fill && neighbor.data[1] < 0) { + loc = oppositeLocations; + } + switch (loc[locationIndicies[opts.tooltipLocation]]) { case 'nw': var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - opts.tooltipOffset - fact * ms; @@ -432,7 +432,7 @@ if (hl.showMarker) { draw(plot, neighbor); } - if (hl.showTooltip && (!c || !c._zoom.started)) { + if (plot.series[neighbor.seriesIndex].show && hl.showTooltip && (!c || !c._zoom.started)) { showTooltip(plot, plot.series[neighbor.seriesIndex], neighbor); } if (hl.bringSeriesToFront) { @@ -452,7 +452,7 @@ if (hl.showMarker) { draw(plot, neighbor); } - if (hl.showTooltip && (!c || !c._zoom.started)) { + if (plot.series[neighbor.seriesIndex].show && hl.showTooltip && (!c || !c._zoom.started)) { showTooltip(plot, plot.series[neighbor.seriesIndex], neighbor); } if (hl.bringSeriesToFront) { Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js 2013-07-19 21:51:14 UTC (rev 167) @@ -1,4 +1,4 @@ -/* %%Ignore-License +/* 2010-11-01 Chris Leonello Slightly modified version of the original json2.js to put JSON Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.json2.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -161,10 +161,10 @@ // perform some checks if (this.min != null && this.min <= 0) { - throw('log axis minimum must be greater than 0'); + throw new Error("Log axis minimum must be greater than 0"); } if (this.max != null && this.max <= 0) { - throw('log axis maximum must be greater than 0'); + throw new Error("Log axis maximum must be greater than 0"); } function findCeil (val) { @@ -192,6 +192,11 @@ // rmax = rmax*(1+adj); // } + // Handle case where a data value was zero + if (rmin === 0) { + rmin = 1; + } + var order = Math.round(Math.log(rmin)/Math.LN10); if (this.tickOptions == null || !this.tickOptions.formatString) { Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -91,7 +91,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -33,7 +33,7 @@ * Class: $.jqplot.MekkoRenderer * Draws a Mekko style chart which shows 3 dimensional data on a 2 dimensional graph. * the <$.jqplot.MekkoAxisRenderer> should be used with mekko charts. The mekko renderer - * overrides the default legend renderer with it's own $.jqplot.MekkoLegendRenderer + * overrides the default legend renderer with its own $.jqplot.MekkoLegendRenderer * which allows more flexibility to specify number of rows and columns in the legend. * * Data is specified per bar in the chart. You can specify data as an array of y values, or as @@ -434,4 +434,4 @@ $.jqplot.preInitHooks.push(preInit); -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -94,7 +94,7 @@ this.needleColor = "#C3D3E5"; // prop: tickColor // color of the tick marks around the gauge. - this.tickColor = "989898"; + this.tickColor = "#989898"; // prop: ringWidth // width of the ring around the gauge. Auto computed by default. this.ringWidth = null; @@ -358,7 +358,7 @@ - // pre-draw so can get it's dimensions. + // pre-draw so can get its dimensions. if (this.label) { this._labelElem = $('<div class="jqplot-meterGauge-label" style="position:absolute;">'+this.label+'</div>'); this.canvas._elem.after(this._labelElem); @@ -413,13 +413,12 @@ // will be center of hub. this._center = [(cw-trans*offx)/2 + trans * offx, (ch-trans*offy)/2 + trans * offy]; } + if (this._labelElem && this.labelPosition == 'bottom') { + this._center[1] -= this._labelElem.outerHeight(true); + } + } - - if (this._labelElem && this.labelPosition == 'bottom') { - this._center[1] -= this._labelElem.outerHeight(true); - } - this._radius = this.diameter/2; this.tickSpacing = 6000/this.diameter; @@ -719,7 +718,7 @@ l = this._tickPoints[i][0] - ew * (this._tickPoints[i][2]-Math.PI)/Math.PI - tp * Math.cos(this._tickPoints[i][2]); t = this._tickPoints[i][1] - eh/2 + eh/2 * Math.pow(Math.abs((Math.sin(this._tickPoints[i][2]))), 0.5) + tp/3 * Math.pow(Math.abs((Math.sin(this._tickPoints[i][2]))), 0.5) ; // t = this._tickPoints[i][1] - eh/2 - eh/2 * Math.sin(this._tickPoints[i][2]) - tp/2 * Math.sin(this._tickPoints[i][2]); - elem.css({left:l, top:t}); + elem.css({left:l, top:t, color: this.tickColor}); dim = ew*Math.cos(this._tickPoints[i][2]) + eh*Math.sin(Math.PI/2+this._tickPoints[i][2]/2); maxdim = (dim > maxdim) ? dim : maxdim; } @@ -739,7 +738,7 @@ else if (this.label && this.labelPosition == 'bottom') { var l = this._center[0] + this.canvas._offsets.left - this._labelElem.outerWidth(true)/2; - var t = this._center[1] + this.canvas._offsets.top + this.innerPad + + this.ringWidth + this.padding + this.labelHeightAdjust; + var t = this._center[1] + this.canvas._offsets.top + this.innerPad + this.ringWidth + this.padding + this.labelHeightAdjust; this._labelElem.css({left:l, top:t}); } @@ -1027,4 +1026,4 @@ })(jQuery); - \ No newline at end of file + Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,8 +2,8 @@ * jqplot.jquerymobile plugin * jQuery Mobile virtual event support. * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * * Copyright (c) 2011 Takashi Okamoto * jqPlot is currently available for use in all personal or commercial projects Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -65,7 +65,7 @@ * */ $.jqplot.OHLCRenderer = function(){ - // subclass line renderer to make use of some of it's methods. + // subclass line renderer to make use of some of its methods. $.jqplot.LineRenderer.call(this); // prop: candleStick // true to render chart as candleStick. @@ -370,4 +370,4 @@ //$.jqplot.preInitHooks.push($.jqplot.OHLCRenderer.checkOptions); -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -88,7 +88,7 @@ // angular spacing between pie slices in degrees. this.sliceMargin = 0; // prop: fill - // true or false, wether to fil the slices. + // true or false, whether to fil the slices. this.fill = true; // prop: shadowOffset // offset of the shadow from the slice and offset of @@ -801,7 +801,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -818,7 +818,7 @@ var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -841,7 +841,7 @@ if (neighbor) { var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data]; var evt = jQuery.Event('jqplotDataClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); @@ -856,7 +856,7 @@ unhighlight(plot); } var evt = jQuery.Event('jqplotDataRightClick'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -155,7 +155,7 @@ labelIdx = p.seriesLabelIndex; } else if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal') { - labelIdx = 0; + labelIdx = (this._plotData[0].length < 3) ? 0 : this._plotData[0].length -1; } else { labelIdx = (this._plotData.length === 0) ? 0 : this._plotData[0].length -1; @@ -294,13 +294,11 @@ for (var i=0, l=p._labels.length; i < l; i++) { var label = p._labels[i]; - if (p.hideZeros && parseInt(p._labels[i], 10) == 0) { - label = ''; + if (label == null || (p.hideZeros && parseInt(label, 10) == 0)) { + continue; } - if (label != null) { - label = p.formatter(p.formatString, label); - } + label = p.formatter(p.formatString, label); helem = document.createElement('div'); p._elems[i] = $(helem); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -111,7 +111,7 @@ // call it within the scope of the axis. this.renderer.createTicks.call(this, plot); // fill a div with axes labels in the right direction. - // Need to pregenerate each axis to get it's bounds and + // Need to pregenerate each axis to get its bounds and // position it and the labels correctly on the plot. var dim=0; var temp; @@ -725,4 +725,4 @@ ticks = null; }; -})(jQuery); \ No newline at end of file +})(jQuery); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -495,7 +495,7 @@ plot.target.trigger(evt1, ins); if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.pyramidRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) { var evt = jQuery.Event('jqplotDataHighlight'); - evt.which = ev.which; + evt.which = ev.which; evt.pageX = ev.pageX; evt.pageY = ev.pageY; plot.target.trigger(evt, ins); Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js =================================================================== --- sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js 2013-07-19 21:51:14 UTC (rev 167) @@ -2,10 +2,10 @@ * jqPlot * Pure JavaScript plotting plugin using jQuery * - * Version: 1.0.4 - * Revision: 1121 + * Version: 1.0.8 + * Revision: 1250 * - * Copyright (c) 2009-2012 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 @@ -60,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. Property changes on: sandbox/nuiton-js-jqplot/src/main/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm =================================================================== --- sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm 2013-07-19 21:51:14 UTC (rev 167) @@ -1,8 +1,8 @@ .. - .. * #%L .. * Nuiton JS :: jqPlot -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2012 - 2013 CodeLutin .. * %% @@ -33,7 +33,7 @@ .. _documentation: http://www.jqplot.com/docs/files/usage-txt.html Use -=== +--- Maven part:: Property changes on: sandbox/nuiton-js-jqplot/src/site/rst/index.rst.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: sandbox/nuiton-js-jqplot/src/site/site_en.xml =================================================================== --- sandbox/nuiton-js-jqplot/src/site/site_en.xml 2013-07-19 21:45:03 UTC (rev 166) +++ sandbox/nuiton-js-jqplot/src/site/site_en.xml 2013-07-19 21:51:14 UTC (rev 167) @@ -1,8 +1,8 @@ <!-- #%L Nuiton JS :: jqPlot - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin %% @@ -45,8 +45,8 @@ <menu ref="parent"/> - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> + <menu name="Users"> + <item name="Home" href="index.html"/> </menu> <menu ref="reports"/> Property changes on: sandbox/nuiton-js-jqplot/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL