Commit Graph

974 Commits (1.0-work)
 

Author SHA1 Message Date
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 eed38b8d4f :not(selector , selector) isn't actually a valid CSS selector
jQuery's Sizzle is the only thing that this actually works in so jQuery will fail when it passes this directly to querySelectorAll()
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
David Schnur 403b9532fb Fix line wrapping and grammar. 13 years ago
David Schnur bdd9ceb906 Merge pull request #1182 from Holek/patch-1
Add Ruby examples
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
Mike Połtyn 2cc2ab8975 typo in ActiveSupport::TimeWithZone example 13 years ago
Mike Połtyn f79e106471 Add Ruby examples 13 years ago
David Schnur c195e836fb Minor cleanup / optimization of font-size defaulting. 13 years ago
David Schnur fd1a02416a Merge pull request #1135 from coldford/master
Fixed a bug where plotting a chart crashes if the placeholder doesn't have a font size
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 4701726302 Additional style fixes on code merged from #1160. 13 years ago
David Schnur 6008cd7a1d Merge pull request #1160 from luisvsilva/master
Fixed Issue #1159 - Bug Redrawing Legend when using custom container
13 years ago
David Schnur 5d99034e24 Mandate jsDoc comments for file/function headers. 13 years ago
David Schnur 86c82e517b Merge pull request #1177 from exactamedia/labelWidth_bug
fix label's maxWidth calculation
13 years ago
Benjamin Gram 6a9f71f70e fix label's maxWidth calculation 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 0c2f6e30c2 Slight cleanup / optimization for #1084. 13 years ago
David Schnur 82f28d28e3 Merge pull request #1084 from execjosh/stop-also-at-root-element
Also stop at root when extracting CSS color
13 years ago
Luis Silva 91d254894d Added curly braces to match flot style guidelines 13 years ago
Luis Silva 3041b38d8d Fixed Issue #1159 - Bug Redrawing Legend when using custom container 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
David Schnur 836c9f15ff Prioritize pull request instructions for clarity. 13 years ago
David Schnur c4aa3cc764 Fix version branch name and clarify spaces v.s. tabs. 13 years ago
execjosh c8c67de8b7 Also stop at root when extracting CSS color
This change adds an additional check for whether the parent element
is `null` or `undefined` in `$.color.extract`.  This can happen when
working with elements that have not yet been added to the DOM under
`<body>`.

Consider the following example pie chart.

    var elm = $("<div />")
      .css({
        width: "240px"
      , height: "320px"
      })
    var data = [
      {label: "One", data: "33"}
    , {label: "Two", data: "33"}
    , {label: "Three", data: "33"}
    ]
    var opts = {
      legend: {
        show: true
      }
    , series: {
        pie: {
          show: true
        }
      }
    }
    $.plot(elm, data, opts)
    elm.appendTo($("body"))

When flot inserts each legend row, it tries to use the same color as
the corresponding graph part, unless it was explicitly specified in
the options.  However, in this example, `$.color.extract` runs into
an unexpected `null` reference because `<body>` is not an ancestor
of `elm`.  Specifically, a `TypeError: Cannot read property
'nodeName' of undefined` would be thrown.
13 years ago
David Schnur 6cd3cb9887 Prevent options from becoming global.
The pie plugin was a little too clever in its use of closures.  In
processDatapoints it set canvas, target, and options for use in other
functions.  Since options was not declared this meant that it became
global.  Pages containing multiple pie plots therefore saw a range of
weird effects resulting from earlier plots receiving some of the options
set by later ones.  Resolves #1128, resolves #1073, resolves #1055.
13 years ago
David Schnur 7deacc9ed1 Clip the pie center only when using offset auto.
If an explicit numeric offset was provided, we should not override it.
The clipping is only meant to apply to the case where the center is
moved to make room for the legend in 'auto' mode, anyway.
13 years ago
Craig Oldford 593cbc5f19 Fixed a bug where plotting a chart crashes if the placeholder doesn't have a font size 13 years ago
David Schnur 3951e0c472 Merge pull request #1127 from brianpeiris/patch-1
Link to PLUGINS.md
13 years ago
Thodoris Greasidis 6f294cedf6 Added plot.destroy() method, to properly destruct and release memory of a plot. 13 years ago
Brian Peiris 4bfa801e31 Link to PLUGINS.md 13 years ago