outfielding-jqplot-rails 1.0.5 → 1.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. data/CHANGELOG.md +5 -0
  2. data/README-jqplot.txt +2 -2
  3. data/changes-jqplot.txt +440 -0
  4. data/copyright-jqplot.txt +56 -0
  5. data/lib/outfielding-jqplot-rails/version.rb +1 -1
  6. data/vendor/assets/javascripts/jqplot-plugins/jqplot.BezierCurveRenderer.js +3 -2
  7. data/vendor/assets/javascripts/jqplot-plugins/jqplot.barRenderer.js +8 -5
  8. data/vendor/assets/javascripts/jqplot-plugins/jqplot.blockRenderer.js +2 -2
  9. data/vendor/assets/javascripts/jqplot-plugins/jqplot.bubbleRenderer.js +2 -2
  10. data/vendor/assets/javascripts/jqplot-plugins/jqplot.canvasAxisLabelRenderer.js +4 -4
  11. data/vendor/assets/javascripts/jqplot-plugins/jqplot.canvasAxisTickRenderer.js +16 -6
  12. data/vendor/assets/javascripts/jqplot-plugins/jqplot.canvasOverlay.js +3 -3
  13. data/vendor/assets/javascripts/jqplot-plugins/jqplot.canvasTextRenderer.js +3 -3
  14. data/vendor/assets/javascripts/jqplot-plugins/jqplot.categoryAxisRenderer.js +4 -4
  15. data/vendor/assets/javascripts/jqplot-plugins/jqplot.ciParser.js +2 -2
  16. data/vendor/assets/javascripts/jqplot-plugins/jqplot.cursor.js +3 -3
  17. data/vendor/assets/javascripts/jqplot-plugins/jqplot.dateAxisRenderer.js +30 -26
  18. data/vendor/assets/javascripts/jqplot-plugins/jqplot.donutRenderer.js +3 -3
  19. data/vendor/assets/javascripts/jqplot-plugins/jqplot.dragable.js +2 -2
  20. data/vendor/assets/javascripts/jqplot-plugins/jqplot.enhancedLegendRenderer.js +2 -2
  21. data/vendor/assets/javascripts/jqplot-plugins/jqplot.funnelRenderer.js +4 -4
  22. data/vendor/assets/javascripts/jqplot-plugins/jqplot.highlighter.js +3 -3
  23. data/vendor/assets/javascripts/jqplot-plugins/jqplot.logAxisRenderer.js +7 -2
  24. data/vendor/assets/javascripts/jqplot-plugins/jqplot.mekkoAxisRenderer.js +3 -3
  25. data/vendor/assets/javascripts/jqplot-plugins/jqplot.mekkoRenderer.js +4 -4
  26. data/vendor/assets/javascripts/jqplot-plugins/jqplot.meterGaugeRenderer.js +7 -7
  27. data/vendor/assets/javascripts/jqplot-plugins/jqplot.mobile.js +2 -2
  28. data/vendor/assets/javascripts/jqplot-plugins/jqplot.ohlcRenderer.js +4 -4
  29. data/vendor/assets/javascripts/jqplot-plugins/jqplot.pieRenderer.js +3 -3
  30. data/vendor/assets/javascripts/jqplot-plugins/jqplot.pointLabels.js +6 -8
  31. data/vendor/assets/javascripts/jqplot-plugins/jqplot.pyramidAxisRenderer.js +4 -4
  32. data/vendor/assets/javascripts/jqplot-plugins/jqplot.pyramidGridRenderer.js +2 -2
  33. data/vendor/assets/javascripts/jqplot-plugins/jqplot.pyramidRenderer.js +2 -2
  34. data/vendor/assets/javascripts/jqplot-plugins/jqplot.trendline.js +3 -3
  35. data/vendor/assets/javascripts/jquery.jqplot.js +74 -60
  36. metadata +4 -2
@@ -0,0 +1,56 @@
1
+ /**
2
+ * jqPlot
3
+ * Pure JavaScript plotting plugin using jQuery
4
+ *
5
+ * Version: @VERSION
6
+ *
7
+ * Copyright (c) 2009-2013 Chris Leonello
8
+ * jqPlot is currently available for use in all personal or commercial projects
9
+ * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
10
+ * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can
11
+ * choose the license that best suits your project and use it accordingly.
12
+ *
13
+ * Although not required, the author would appreciate an email letting him
14
+ * know of any substantial use of jqPlot. You can reach the author at:
15
+ * chris at jqplot dot com or see http://www.jqplot.com/info.php .
16
+ *
17
+ * If you are feeling kind and generous, consider supporting the project by
18
+ * making a donation at: http://www.jqplot.com/donate.php .
19
+ *
20
+ * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
21
+ *
22
+ * version 2007.04.27
23
+ * author Ash Searle
24
+ * http://hexmen.com/blog/2007/03/printf-sprintf/
25
+ * http://hexmen.com/js/sprintf.js
26
+ * The author (Ash Searle) has placed this code in the public domain:
27
+ * "This code is unrestricted: you are free to use it however you like."
28
+ *
29
+ * included jsDate library by Chris Leonello:
30
+ *
31
+ * Copyright (c) 2010-2013 Chris Leonello
32
+ *
33
+ * jsDate is currently available for use in all personal or commercial projects
34
+ * under both the MIT and GPL version 2.0 licenses. This means that you can
35
+ * choose the license that best suits your project and use it accordingly.
36
+ *
37
+ * jsDate borrows many concepts and ideas from the Date Instance
38
+ * Methods by Ken Snyder along with some parts of Ken's actual code.
39
+ *
40
+ * Ken's origianl Date Instance Methods and copyright notice:
41
+ *
42
+ * Ken Snyder (ken d snyder at gmail dot com)
43
+ * 2008-09-10
44
+ * version 2.0.2 (http://kendsnyder.com/sandbox/date/)
45
+ * Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
46
+ *
47
+ * jqplotToImage function based on Larry Siden's export-jqplot-to-png.js.
48
+ * Larry has generously given permission to adapt his code for inclusion
49
+ * into jqPlot.
50
+ *
51
+ * Larry's original code can be found here:
52
+ *
53
+ * https://github.com/lsiden/export-jqplot-to-png
54
+ *
55
+ *
56
+ */
@@ -1,7 +1,7 @@
1
1
  module Outfielding
2
2
  module Jqplot
3
3
  module Rails
4
- VERSION = "1.0.5"
4
+ VERSION = "1.0.7"
5
5
  end
6
6
  end
7
7
  end
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -289,6 +289,7 @@
289
289
  function preInit(target, data, options) {
290
290
  options = options || {};
291
291
  options.axesDefaults = $.extend(true, {pad:0}, options.axesDefaults);
292
+ options.seriesDefaults = options.seriesDefaults || {};
292
293
  options.legend = $.extend(true, {placement:'outside'}, options.legend);
293
294
  // only set these if there is a pie series
294
295
  var setopts = false;
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -115,7 +115,7 @@
115
115
 
116
116
  //////
117
117
  // This is probably wrong here.
118
- // After going back and forth on wether renderer should be the thing
118
+ // After going back and forth on whether renderer should be the thing
119
119
  // or extend the thing, it seems that it it best if it is a property
120
120
  // on the thing. This should be something that is commonized
121
121
  // among series renderers in the future.
@@ -513,7 +513,7 @@
513
513
  xstart = 0;
514
514
  }
515
515
  }
516
- if ((this.fillToZero && this._plotData[i][1] < 0) || (this.waterfall && this._data[i][1] < 0)) {
516
+ if ((this.fillToZero && this._plotData[i][0] < 0) || (this.waterfall && this._data[i][0] < 0)) {
517
517
  if (this.varyBarColor && !this._stack) {
518
518
  if (this.useNegativeColors) {
519
519
  opts.fillStyle = negativeColors.next();
@@ -522,6 +522,9 @@
522
522
  opts.fillStyle = positiveColors.next();
523
523
  }
524
524
  }
525
+ else {
526
+ opts.fillStyle = negativeColor;
527
+ }
525
528
  }
526
529
  else {
527
530
  if (this.varyBarColor && !this._stack) {
@@ -794,4 +797,4 @@
794
797
  }
795
798
 
796
799
 
797
- })(jQuery);
800
+ })(jQuery);
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -52,10 +52,10 @@
52
52
  // name of the axis associated with this tick
53
53
  this.axis;
54
54
  // prop: show
55
- // wether or not to show the tick (mark and label).
55
+ // whether or not to show the tick (mark and label).
56
56
  this.show = true;
57
57
  // prop: showLabel
58
- // wether or not to show the label.
58
+ // whether or not to show the label.
59
59
  this.showLabel = true;
60
60
  // prop: label
61
61
  // label for the axis.
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -49,10 +49,10 @@
49
49
  // tick mark on the axis. One of 'inside', 'outside', 'cross', '' or null.
50
50
  this.mark = 'outside';
51
51
  // prop: showMark
52
- // wether or not to show the mark on the axis.
52
+ // whether or not to show the mark on the axis.
53
53
  this.showMark = true;
54
54
  // prop: showGridline
55
- // wether or not to draw the gridline on the grid at this tick.
55
+ // whether or not to draw the gridline on the grid at this tick.
56
56
  this.showGridline = true;
57
57
  // prop: isMinorTick
58
58
  // if this is a minor tick.
@@ -65,10 +65,10 @@
65
65
  // will be stoked above and below axis, so total length will be twice this.
66
66
  this.markSize = 4;
67
67
  // prop: show
68
- // wether or not to show the tick (mark and label).
68
+ // whether or not to show the tick (mark and label).
69
69
  this.show = true;
70
70
  // prop: showLabel
71
- // wether or not to show the label.
71
+ // whether or not to show the label.
72
72
  this.showLabel = true;
73
73
  // prop: labelPosition
74
74
  // 'auto', 'start', 'middle' or 'end'.
@@ -180,6 +180,16 @@
180
180
  return w;
181
181
  }
182
182
  };
183
+
184
+ // return top.
185
+ $.jqplot.CanvasAxisTickRenderer.prototype.getTop = function(ctx) {
186
+ if (this._elem) {
187
+ return this._elem.position().top;
188
+ }
189
+ else {
190
+ return null;
191
+ }
192
+ };
183
193
 
184
194
  $.jqplot.CanvasAxisTickRenderer.prototype.getAngleRad = function() {
185
195
  var a = this.angle * Math.PI/180;
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -107,7 +107,7 @@
107
107
  // color of the line
108
108
  color: '#666666',
109
109
  // prop: shadow
110
- // wether or not to draw a shadow on the line
110
+ // whether or not to draw a shadow on the line
111
111
  shadow: true,
112
112
  // prop: shadowAngle
113
113
  // Shadow angle in degrees
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -38,7 +38,7 @@
38
38
  * jsDate borrows many concepts and ideas from the Date Instance
39
39
  * Methods by Ken Snyder along with some parts of Ken's actual code.
40
40
  *
41
- * Ken's origianl Date Instance Methods and copyright notice:
41
+ * Ken's original Date Instance Methods and copyright notice:
42
42
  *
43
43
  * Ken Snyder (ken d snyder at gmail dot com)
44
44
  * 2008-09-10
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -306,7 +306,7 @@
306
306
  // call it within the scope of the axis.
307
307
  this.renderer.createTicks.call(this);
308
308
  // fill a div with axes labels in the right direction.
309
- // Need to pregenerate each axis to get it's bounds and
309
+ // Need to pregenerate each axis to get its bounds and
310
310
  // position it and the labels correctly on the plot.
311
311
  var dim=0;
312
312
  var temp;
@@ -670,4 +670,4 @@
670
670
  };
671
671
 
672
672
 
673
- })(jQuery);
673
+ })(jQuery);
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -42,7 +42,7 @@
42
42
  this.style = 'crosshair';
43
43
  this.previousCursor = 'auto';
44
44
  // prop: show
45
- // wether to show the cursor or not.
45
+ // whether to show the cursor or not.
46
46
  this.show = $.jqplot.config.enablePlugins;
47
47
  // prop: showTooltip
48
48
  // show a cursor position tooltip. Location of the tooltip
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -33,7 +33,7 @@
33
33
  * Class: $.jqplot.DateAxisRenderer
34
34
  * A plugin for a jqPlot to render an axis as a series of date values.
35
35
  * This renderer has no options beyond those supplied by the <Axis> class.
36
- * It supplies it's own tick formatter, so the tickOptions.formatter option
36
+ * It supplies its own tick formatter, so the tickOptions.formatter option
37
37
  * should not be overridden.
38
38
  *
39
39
  * Thanks to Ken Synder for his enhanced Date instance methods which are
@@ -334,14 +334,35 @@
334
334
  var tt, i;
335
335
  var threshold = 30;
336
336
  var insetMult = 1;
337
+ var daTickInterval = null;
338
+
339
+ // if user specified a tick interval, convert to usable.
340
+ if (this.tickInterval != null)
341
+ {
342
+ // if interval is a number or can be converted to one, use it.
343
+ // Assume it is in SECONDS!!!
344
+ if (Number(this.tickInterval)) {
345
+ daTickInterval = [Number(this.tickInterval), 'seconds'];
346
+ }
347
+ // else, parse out something we can build from.
348
+ else if (typeof this.tickInterval == "string") {
349
+ var parts = this.tickInterval.split(' ');
350
+ if (parts.length == 1) {
351
+ daTickInterval = [1, parts[0]];
352
+ }
353
+ else if (parts.length == 2) {
354
+ daTickInterval = [parts[0], parts[1]];
355
+ }
356
+ }
357
+ }
337
358
 
338
359
  var tickInterval = this.tickInterval;
339
360
 
340
361
  // if we already have ticks, use them.
341
362
  // ticks must be in order of increasing value.
342
363
 
343
- min = ((this.min != null) ? new $.jsDate(this.min).getTime() : db.min);
344
- max = ((this.max != null) ? new $.jsDate(this.max).getTime() : db.max);
364
+ min = new $.jsDate((this.min != null) ? this.min : db.min).getTime();
365
+ max = new $.jsDate((this.max != null) ? this.max : db.max).getTime();
345
366
 
346
367
  // see if we're zooming. if we are, don't use the min and max we're given,
347
368
  // but compute some nice ones. They will be reset later.
@@ -464,7 +485,7 @@
464
485
  // tickInterval will be used before numberTicks, that is if
465
486
  // both are specified, numberTicks will be ignored.
466
487
  else if (this.tickInterval) {
467
- titarget = this.tickInterval;
488
+ titarget = new $.jsDate(0).add(daTickInterval[0], daTickInterval[1]).getTime();
468
489
  }
469
490
 
470
491
  // if numberTicks specified, try to honor it.
@@ -480,9 +501,8 @@
480
501
  var tempti = ret[0];
481
502
  this._autoFormatString = ret[1];
482
503
 
483
- min = Math.floor(min/tempti) * tempti;
484
504
  min = new $.jsDate(min);
485
- min = min.getTime() + min.getUtcOffset();
505
+ min = Math.floor((min.getTime() - min.getUtcOffset())/tempti) * tempti + min.getUtcOffset();
486
506
 
487
507
  nttarget = Math.ceil((max - min) / tempti) + 1;
488
508
  this.min = min;
@@ -640,24 +660,8 @@
640
660
  this.tickInterval = null;
641
661
  }
642
662
 
643
- // if user specified a tick interval, convert to usable.
644
- if (this.tickInterval != null)
645
- {
646
- // if interval is a number or can be converted to one, use it.
647
- // Assume it is in SECONDS!!!
648
- if (Number(this.tickInterval)) {
649
- this.daTickInterval = [Number(this.tickInterval), 'seconds'];
650
- }
651
- // else, parse out something we can build from.
652
- else if (typeof this.tickInterval == "string") {
653
- var parts = this.tickInterval.split(' ');
654
- if (parts.length == 1) {
655
- this.daTickInterval = [1, parts[0]];
656
- }
657
- else if (parts.length == 2) {
658
- this.daTickInterval = [parts[0], parts[1]];
659
- }
660
- }
663
+ if (this.tickInterval != null && daTickInterval != null) {
664
+ this.daTickInterval = daTickInterval;
661
665
  }
662
666
 
663
667
  // if min and max are same, space them out a bit
@@ -2,8 +2,8 @@
2
2
  * jqPlot
3
3
  * Pure JavaScript plotting plugin using jQuery
4
4
  *
5
- * Version: 1.0.5
6
- * Revision: 1122+
5
+ * Version: 1.0.7
6
+ * Revision: 1224
7
7
  *
8
8
  * Copyright (c) 2009-2013 Chris Leonello
9
9
  * jqPlot is currently available for use in all personal or commercial projects
@@ -101,7 +101,7 @@
101
101
  // null will compute ringMargin based on sliceMargin.
102
102
  this.ringMargin = null;
103
103
  // prop: fill
104
- // true or false, wether to fil the slices.
104
+ // true or false, whether to fil the slices.
105
105
  this.fill = true;
106
106
  // prop: shadowOffset
107
107
  // offset of the shadow from the slice and offset of