Commit Graph

40 Commits (0.9-work)

Author SHA1 Message Date
David Schnur 3035aaaeca Merge branch 'master' into 0.9-work
Conflicts:
	component.json
	flot.jquery.json
	jquery.flot.js
	jquery.flot.pie.js
	jquery.flot.resize.js
	lib/jquery.colorhelpers.js
	package.json
13 years ago
Jeff Tian b100f441cd Enrich the flot with the ability to add text into markings.
Use $.isArray instead of instanceof Array; Use full name for parameters.
13 years ago
David Schnur 403b9532fb Fix line wrapping and grammar. 13 years ago
Mike Połtyn 2cc2ab8975 typo in ActiveSupport::TimeWithZone example 13 years ago
Mike Połtyn f79e106471 Add Ruby examples 13 years ago
Brian Peiris 4bfa801e31 Link to PLUGINS.md 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 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
Patrik Ragnarsson 488fbc8df5 Fix typo in API.md 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 bb18e099f1 Merge branch 'master' into 0.9-work 13 years ago
Brian Peiris 2b901841b2 Move TOC below main title and make it horizontal 13 years ago
Brian Peiris d777b2e795 Add table of contents
The reference document is quite large; a table of contents would help readers navigate and find topics. (TOC was generated via [DocToc](http://doctoc.herokuapp.com/))
13 years ago
David Schnur 355331fd5f Merge tag '0.8.1' into 0.9-work 13 years ago
Brian Peiris 3f0d693151 Add link to README.md 13 years ago
David Schnur 24f70fc6bd Re-introduced the %h specifier for back-compat. 13 years ago
David Schnur 0d26732e93 Updated docs with the point strokeColor option. 13 years ago
David Schnur e3c45a5a98 Fixed missing comma in demo code. 13 years ago
David Schnur bceb4bfca2 Added lineHeight to the font-spec object.
Line height is a core font property - it can be specified as part of the
unified 'font' definition - and we therefore need to give users access
to it when they're manually defining the font.
13 years ago
David Schnur df0875e549 Replace the stylesheet hack with inline styles.
The purpose of the stylesheet hack was to provide a default without
having to use inline styles on containers.  We can do this much more
neatly by instead just giving the inline styles to a parent container,
leaving users free to customize the children.
13 years ago
David Schnur 3cd7a51026 Axis and tick color options now make more sense.
The axis color now controls the color of the axis line, instead of its
ticks and labels, while the tickColor controls the tick color. This
makes a little more sense and provides the minor feature of being able
to change the axis line color separately from that of its ticks.  Pull
request #917 ought to be easier to merge now, too.
13 years ago
David Schnur 60ed6b2963 Merge pull request #935 from dnschnur/canvas-text
Moved canvas text support into a plugin.
13 years ago
David Schnur 27c701112d Updated the API docs for axis text changes. 13 years ago
David Schnur 6bbce44644 Updated the API with the legend 'reverse' option. 13 years ago
David Schnur aaa1cc7f84 Document the new plot chainable property. 13 years ago
David Schnur 151e96fb27 Expand documentation of the point format options. 13 years ago
David Schnur 1e685b0446 Documented the zero option for bars and lines. 13 years ago
David Schnur 8760ee77e9 Added undocumented labelFormatter null behavior. 14 years ago
Mark Côté c0900a1dac Updated API.md for %q time-series tick-label option. 14 years ago
ara818 5fcb64ff20 Support different border color, widths for each side of the chart 14 years ago
Chage Juan 88305db102 Update API.md
Fix typo
14 years ago
David Schnur 070fd83557 Added docs for the highlightColor option. 14 years ago
David Schnur cc974bd0a6 Additional cleanup and markup standardization. 14 years ago
David Schnur a4de2cab33 Additional cleanup and markup standardization. 14 years ago
David Schnur 633dd824c2 Cleaned up and standardized markup. 14 years ago
Alexander Blunck 4fa6e38018 Correct GitHub Syntax Highlighting in API markdown 14 years ago
David Schnur d51a101324 Merge pull request #22 from phusion/markdown_docs 14 years ago
Hongli Lai (Phusion) 6f40a555aa Rename *.txt.md to *.md. 15 years ago