github-mirrors
/
thingsboard-flot
mirror of https://github.com/thingsboard/flot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
903 Commits
3 Branches
17 Tags
2.5 MiB
0.9-work
1.0-work
master
v0.7
0.8.0
0.8.0-beta
0.8.1
0.8.2
v0.1.0
v0.2.0
v0.3.0
v0.4.0
v0.5.0
v0.6.0
v0.7.0
v0.8.0
v0.8.0-beta
v0.8.1
v0.8.2
v0.8.3
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fc1e40948a'
${ noResults }
Commit Graph

903 Commits (fc1e40948a9bdfe392097770a90782d3dd51c91d)
 

Author SHA1 Message Date
David Schnur fc1e40948a Fixed style violations introduced by 0.8.2 merge. 13 years ago
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
David Schnur ea4bfb11ce Merge pull request #1178 from Jeff-Tian/0.9-work 
Enrich Flot with the ability to add text into markings.
 13 years ago
David Schnur 39bc058b21 Fixed an error when plotting an empty dataset. 
This was accidentally introduced by #1200; we can’t assume that
axis.ticks is an array.
 13 years ago
David Schnur 525d46ea8d Removed duplicate NEWS entry. 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 00e93b6d46 Update version numbers to 0.8.2 final. 13 years ago
David Schnur d436c04c86 Updated NEWS for the 0.8.2 release. 13 years ago
David Schnur 08d5bfadaa Merge pull request #1200 from dnschnur/xaxis-plot-size-fix 
Don't add padding when there's no last tick.
 13 years ago
David Schnur 968271a458 Merge pull request #1199 from dnschnur/line-height-default-fix 
Default lineHeight based on the font size.
 13 years ago
David Schnur d973ba22d3 Merge pull request #1198 from dnschnur/axis-grid-fix 
Distinguish between the first and innermost axis.
 13 years ago
David Schnur 745d24cc79 Default lineHeight based on the font size. 
Flot 0.8.0 used the default font size, typically derived from the
placeholder, as the basis for the default lineHeight.  This produced
incorrect results when a font.size was provided explicitly, and it
differed from the placeholder’s CSS size.

Fixed by waiting to default lineHeight until the actual font size has
been resolved.  Fixes #1131.
 13 years ago
David Schnur 1650c18442 Don't add padding when there's no last tick. 
Flot 0.8 added logic to account for the size of axis tick labels and add
padding around the edges of the plot, to prevent long labels from
sticking out.  But it padded both sides equally, which is incorrect if
the right/top side has no last axis label.

Fixed by allocating padding per-side, and checking whether the last
label would be shown before padding the top or right.  Fixes #1048.
 13 years ago
David Schnur edac9e0ed2 Distinguish between the first and innermost axis. 
The fix for #1056 caused a regression where grid lines were drawn for
the innermost axes on both sides instead of just the first axis.
Fixed by properly distinguishing the first axis in each direction from
the innermost one on each side.  Fixes #1075.
 13 years ago
David Schnur 7fa063e9ba Merge pull request #1130 from thgreasi/master 
Added plot.destroy() method, to properly destruct and release memory of plots.
 13 years ago
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
David Schnur 319f4dfe94 Apply fix from #1084 to the inline copy in jquery.flot.js. 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 65cba84351 Merge pull request #1180 from anthonyryan1/complex-not-bug 
:not(selector , selector) isn't actually a valid CSS selector
 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 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