Commit Graph

979 Commits (5de5f3190b78f558c77e8e95eb52b623c21f6ecb)
 

Author SHA1 Message Date
thomas.duval 5de5f3190b thomas-AOT-4029 pr 5 years ago
thomas.duval 1f14b71bb8 thomas-AOT-4029 add index of the series 5 years ago
thomas.duval 3dcdcbd7ca thomas-AOT-4029 add extra parameters to show alarm on graph 5 years ago
thomas.duval ec819693cc thomas-AOT-4029 add arguments to the draw symbol to get datapoints and time series 5 years ago
tdsimpro 3c637c1437
Merge pull request #1 from simPRO-Software/bugfix/thomas-AOT-3767-flot
Bugfix/thomas aot 3767 flot
5 years ago
Thomas Duval 28ee2d04ae AOT-3767 : self review 5 years ago
Thomas Duval 75cc3da261 AOT-3767 : add a new attribute to markings to be above the graph while keeping the grid below the graph 5 years ago
Andrew Shvayka 0ff0c775db
Merge pull request #1 from Terny22/0.9-work
Fixed bug with charts hiding in stack mode
6 years ago
Sergey Tarnavskiy 963d316880 Fixed bug with charts hiding in stack mode 6 years ago
Igor Kulikov 6e1a370958 Fix interactive variables declaration order. 9 years ago
David Schnur 95b6b635e9 Merge pull request #1316 from jacoblwe20/0.9-work
Removing appending warning to dom
12 years ago
Jacob Lowe 46719d55fc requested revisions, switching to dubs, and jshint declaration 12 years ago
Jacob Lowe 6df2a921dd removing appending warning to dom 12 years ago
David Schnur 4ff36332c7 Fix failures introduced by the merge from master. 12 years ago
David Schnur 7043573aaa Merge branch 'master' into 0.9-work
Conflicts:
	NEWS.md
	component.json
	flot.jquery.json
	jquery.flot.canvas.js
	jquery.flot.fillbetween.js
	jquery.flot.pie.js
	jquery.flot.time.js
	package.json
	src/jquery.flot.js
	src/plugins/jquery.flot.crosshair.js
	src/plugins/jquery.flot.navigate.js
	src/plugins/jquery.flot.resize.js
12 years ago
David Schnur 453b017cc5 Update version number to 0.8.3 final. 12 years ago
David Schnur f17893ea35 Updated NEWS for the 0.8.3 release. 12 years ago
David Schnur 7f63b0703b Work-around for full-width plots.
Introduces an unofficial work-around for the behavior introduced in
0.8.0, where we reserve extra space for the first and last tick labels.
 This makes it impossible for plots to span the full width of their
container.

This work-around overloads the reserveSpace option, which normally only
applies when show = false.  Now, if show = true and reserveSpace =
false, we skip the step that allocates extra space for labels.

We’ll introduce a proper solution in 0.9, but this should provide a way
for users to move forward in the meantime.
12 years ago
David Schnur 27883ac92b Merge pull request #1290 from dnschnur/axis-labels-fix
Revert #1200; it was causing #1283 breakages.
12 years ago
David Schnur 0beb104eb9 Revert #1200; it was causing #1283 breakages.
The fix for an unnecessary gap on the right of the chart turned out to
break text wrapping for ticks that were legitimately in that position.

Fixes #1283.
12 years ago
David Schnur 2a3e3cd4da Merge pull request #1289 from dnschnur/resize-rate-fix
Update the inline resize plugin with recent fixes.
12 years ago
David Schnur e31ff8e565 Fix IE-breaking trailing comma in the example. 12 years ago
David Schnur 7aec501eaf Update the inline resize plugin with recent fixes.
This updates the inline resize plugin with
flot/jquery-resize@74716750f4 and flot/jquery-resize@189b555558.

Fixes #1277 and #1265.
12 years ago
David Schnur 1d3a062833 Update copyright year to 2014. 12 years ago
David Schnur 51aea3463b Merge pull request #1284 from dnschnur/multi-axis-min-fix
Allow x2axis/y2axis with no min/max to auto-scale.
12 years ago
David Schnur 7f906431f7 Merge pull request #1285 from dnschnur/jquery-attr-fix
Fix zoom to selection box when using jQuery 1.9+.
12 years ago
David Schnur 095799cd13 Merge pull request #1286 from dnschnur/jquery-detach-fix
Provide a detach shim for jQuery prior to 1.4.
12 years ago
David Schnur 86f7ab1e48 Allow x2axis/y2axis with no min/max to auto-scale.
Using x2axis/y2axis to add a second axis is deprecated, but we
currently still support it.  Historically we’ve just extended the first
axis’s options with the second’s, but that is a problem when the first
has min/max and the second doesn’t; it will inherit an inappropriate
min/max.

We might want to consider not extending at all, but since that’s a
bigger change we’ll for now just ensure that if no min/max is
specified, we respect that.

Fixes #1228.
12 years ago
David Schnur e17d379834 Provide a detach shim for jQuery prior to 1.4.
Flot 0.8 still officially supports jQuery 1.2.6 and higher, so we can’t
assume the existence of detach.  This will go away in 0.9, where the
minimum jQuery version is 1.4.4.

Fixes #1240.
12 years ago
David Schnur 4964dcb3c1 Fix zoom to selection box when using jQuery 1.9+.
Fixes #1250.
12 years ago
David Schnur 3aec7ce0bd Merge pull request #1221 from soenter/master
Improve the performance of large data processing
12 years ago
Nick Schonning f2b3b266a9 Merge pull request #1241 from nschonni/jsdoc-cleanup
Add spacing to comments in jquery.flot.js
12 years ago
Nick Schonning 14cc92f748 Bump Grunt JSCS checker to 0.4.1
Old version had a hard peerDependency that caused npm install to fail during CI. The lastest uses a more flexible version mapping.
12 years ago
David Schnur ecc4896182 Merge pull request #1258 from MHWallaby/0.9-work
Pan trigger extended to contain information if the dragging has ended or not
12 years ago
Michael Hausl ba4de812f5 Removed unneccessary comma 12 years ago
Michael Hausl e48d0662a9 Pan trigger extended to contain information if the dragging has ended or
not
12 years ago
David Schnur b36246bbe6 Merge pull request #1238 from SaM-Solutions/fix-combined-data
Pie: Fix combined data to keep all other original values.
12 years ago
Phil Tsarik 28cc35845f Add a comment explaining why extend is being used 12 years ago
David Schnur 0b031061d1 Merge pull request #1246 from bastjan/0.9-work
Fix browser detection for jQuery > 2.0
12 years ago
Sebastian Widmer 5f59ec87c9 add comment to browser detection 12 years ago
Sebastian Widmer 6fd170d034 no confusing use of "!" 12 years ago
Sebastian Widmer 143c61a550 fix browser detection for jQuery > 2.0
jQuery removed $.support.leadingWhitespace from jquery greater 2.0
because support was dropped for IE 7/8. So if property is undefined,
we are pretty shure its ie > 8 or jQuery does not support the browser
anyway.
12 years ago
Nick Schonning 4f29359332 Add spacing to comments in jquery.flot.js
- Fix JSDoc headers where applicable
- Add spacing before/after comments per jQuery style guide
12 years ago
soenter 38f7a8c58d Improve the performance of large data processing(fix spaces -> tabs) 12 years ago
David Schnur 08e705fd6f Merge pull request #1239 from jgillich/patch-2
Lowercase name in package.json
12 years ago
Jakob Gillich 09b280c147 Lowercase name in package.json 12 years ago
David Schnur 8d8973ee34 Merge pull request #1230 from nschonni/reorg-file-tree
Move JS files under src directory
12 years ago
Nick Schonning d37ce8e3fe Update examples page script paths 12 years ago
Phil Tsarik bc707fead9 Pie: Fix combined data to keep all other original values.
But not only data, color, label, angle, percent as was before.
Allows to store own values in series and use them e.g. in labelFormatter.
12 years ago
David Schnur a3a1404420 Merge pull request #1231 from nschonni/fix-jscs-task
Fix JSCS task
12 years ago