Commit Graph

841 Commits (a8aac7a1a0c0a0cb19789dc263ccdcae9f437d34)
 

Author SHA1 Message Date
David Schnur a8aac7a1a0 Merge pull request #1195 from nschonni/add-gitattributes
Add .gitattributes file for EOL normalization
13 years ago
Nick Schonning 98aba43184 Add .gitattributes file for EOL normalization 13 years ago
David Schnur 7593583ba1 Merge pull request #1190 from Jeff-Tian/FixIssues
Add missing references and minor update on jquery.flot.js.
13 years ago
Jeff Tian eae079f580 Add missing references and minor update on jquery.flot.js.
Revert the change on jquery.flot.js

Revert the change on jquery.flot.js

Add missing references and minor update on jquery.flot.js.

Revert the change on jquery.flot.js

Revert changes on jquery.flot.js.

Revert the changes to the jquery.flot.js that made by Visual Studio 2012.
13 years ago
David Schnur c34744fcfe Merge pull request #1194 from jBouyoud/0.9-patch-707-778
Patch for Issue #707 and #778 (0.9-work)
13 years ago
David Schnur 6578355dc0 Merge pull request #1188 from mcamenzind/0.9-work
Added ability to resize the plot to a given size.
13 years ago
Julien Bouyoud 0706d03695 Put a tab instead of with spaces 13 years ago
Julien Bouyoud 2e513c99aa Patch for Issue 707 and 778
- Fixes the issue where steps altering user datapoints
- Do not altering user data points for drawing lines with steps 
(even stacked); just consider drawing with steps enables a different 
kind of plotting and clipping on lines and areas; that assuming that 
drawing with steps must always go horizontally and then verticaly 
(like previous inserted datapoints).
13 years ago
Marzell Camenzind 07a6189d29 Added ability to resize the plot to a given size. 13 years ago
David Schnur 8a7204de50 Merge pull request #1184 from anthonyryan1/0.9-work
CSP compatibility (flot core)
13 years ago
Anthony Ryan 947ba2f8a5 Fix the jQuery tag creation process
Move the rowBuffer definition closer to it's usage within the method
13 years ago
David Schnur 9267b3e9ea Merge pull request #1186 from Ninir/ignore_improvements
Bower.json - Ignore rule edition
13 years ago
Ninir 93ffe6bf0c Added markdown files, txt files and the examples dir to the bower ignore rule 13 years ago
Anthony Ryan bec29dcd2e Fix a serious oversight that occurred when merging pull request #919 into 0.9-work for this pull request 13 years ago
Anthony Ryan b009b371aa Address formatting concerns
* Removed self-closing tags
* Move the the nested divs into variables
* Expand the object literals for easier reading
13 years ago
Anthony Ryan 864ef0282c Fix an unrelated style guide violation merged earlier today 13 years ago
Anthony Ryan c14eaf4587 CSP compatibility for flot legend 13 years ago
David Schnur 9671e73def Merge pull request #1113 from trask/highlight-vertexes-when-no-points
Highlight vertexes when no points
13 years ago
David Schnur 9bb52ea5b9 Merge branch '0.9-jsDoc-fix' of https://github.com/ameyms/flot into ameyms-0.9-jsDoc-fix
Conflicts:
	jquery.flot.js
13 years ago
David Schnur 6e76ffff14 Merge pull request #1168 from ameyms/0.9-use-jq-isNumeric
A new isNumeric function instead of typeof number
13 years ago
Amey Sakhadeo 61fb96d792 Use jsDoc style comments 13 years ago
Amey Sakhadeo 77405d86f5 Use jquery.isNumeric instead of typeof number 13 years ago
David Schnur 7aeaf99c29 Merge pull request #1144 from nschonni/0.9-move-dependencies-to-bower
0.9 move dependencies to bower
13 years ago
Nick Schonning 4e66f981e2 Move non-Bower third party code under lib 13 years ago
Nick Schonning f849daa090 Add missing Bower package values
Values from package.json
13 years ago
Nick Schonning 0147811776 Rename Bower file
The component.json filename has been depreciated
13 years ago
David Schnur 881fc001b7 Merge pull request #1152 from sgissinger/patch-3
Update jquery.flot.threshold.js
13 years ago
David Schnur cc1d6bf38c Minor cleanup in axisOptions check. 13 years ago
David Schnur 80851c0dd7 Merge pull request #1107 from trask/undefined-axis-options-fix
Handle undefined axisOptions in 0.9-work
13 years ago
David Schnur 5ae2236caa Merge pull request #1145 from nschonni/0.9-tabs-to-spaces
Convert all tabs to 4-space indents.
13 years ago
sgissinger 0006469d9f Update jquery.flot.threshold.js
Displays the serie base color and the threshold color side by side in the legend.
When no treshold is color is set, default black color is used.
13 years ago
Nick Schonning 7c52f44431 Convert remaining tabs to spaces 13 years ago
David Schnur 8e2f09a97c Merge pull request #1141 from nschonni/0.9-jshint-indent4
0.9 jshint indent4
13 years ago
Nick Schonning 678ff275ba Enforce indenting with JSHint
- Doesn't differentiate between tabs and spaces
- Switch/Case indenting may seem odd to some
13 years ago
David Schnur d76e1cb2ec Merge pull request #1139 from nschonni/0.9-grunt-build
0.9 grunt build
13 years ago
David Schnur aa2d7d1043 Merge pull request #1140 from nschonni/0.9-add-editorconfig
0.9 add editorconfig
13 years ago
Nick Schonning 9fb67cf4b6 Add EditorConfig setting
Allows for consistent spacing and indenting when combined with supported
IDEs
13 years ago
Nick Schonning 529a087f09 Replace Makefile with Grunt 13 years ago
Trask Stalnaker a17be4c57e Highlight vertexes when no points
When series.points.show is false, currently a ring appears on highlight
around where the point would have been.  Instead, display the point on
highlight.
13 years ago
Trask Stalnaker 5e3ba78f6f Handle undefined axisOptions
I ran into this issue when upgrading from 0.8.1 to 0.9-work.
13 years ago
David Schnur 4318eeaed0 Merge pull request #1090 from dnschnur/axis-labels
Added axis labels and rotated text support.
13 years ago
David Schnur 4d1042abf6 Rotate y-axis labels by 90 degrees.
The labels are rotated counter-clockwise for left axes and clockwise for
right axes.
13 years ago
David Schnur 6350cc6700 Added core support for rotated HTML text. 13 years ago
David Schnur 97f2a127ae Axes can now have basic horizontal text labels.
Labels are provided via a 'label' option on the axis, and can be styled
with the flot-axis-label class.  The labelFont option works similarly to
tickFont, as an override for the default font or the flot-axis-label
class.  The labelPadding option adds extra space between the axis and
its label.

Since most plots with axis labels currently use @markrcote's
flot-axislabels plugin, we also support the axisLabel and
axisLabelPadding options, and the axisLabels / axis[name]Label CSS
classes, to make it as easy as possible to transition from that plugin.
These are deprecated, and will be removed in 1.0.

The implementation uses the internal text API introduced in 0.8.
13 years ago
David Schnur 5209b8cd7f Inline legacyStyles; it wasn't reused anyway. 13 years ago
David Schnur f75a5a514f Updated axis option defaults and documentation.
Updated the axis option defaults and docs for tickColor, tickFont,
tickWidth, and tickHeight. Also re-organized the API docs to match the
master list, and revised many areas for clarity.
13 years ago
David Schnur 8d38774cac Added axis.tickFont as an override for axis.font. 13 years ago
David Schnur 65c38d0b59 Minor reordering of axis options. 13 years ago
David Schnur cfe16e1edb Rename labelWidth/Height to tickWidth/Height. 13 years ago
David Schnur b079efca0d Merge branch 'code-cleanup' into 0.9-work
Conflicts:
	jquery.flot.js
	jquery.flot.threshold.js
13 years ago