Skip to content

合并修改#1

Open
hizhengfu wants to merge 517 commits into
hizhengfu:masterfrom
flot:master
Open

合并修改#1
hizhengfu wants to merge 517 commits into
hizhengfu:masterfrom
flot:master

Conversation

@hizhengfu
Copy link
Copy Markdown
Owner

合并修改

dnschnur and others added 30 commits April 19, 2014 17:54
Update the inline resize plugin with recent fixes.
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.
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.
fix a few trivial typos concerning "separation" and "command"
fixed typo in jquery.flot.stack.js
Use source code directly in examples
Merge flot/flot master
thmo and others added 30 commits January 29, 2020 17:15
Selection will not work unless the `jquery.event.drag.js` library is included.
Update the selection example.
Cancel jQuery animation queue on hover off
Fix - ReferenceError when using fillbetween (#1727)
Add a configuration option to determine if the selection decorations …
…eplace-this-with-window

Fix - flot.resize e.setTimeout is not a function #1715
Allow user defined tickFormatter for time axis
* Fixed eslint configuration and fixed errors

* Reverted unintended changes

* Fixed new lint errors

* Fixed even more lint errors
* Removed webcharts-development-settings dependency

* Fixed package-lock
* Don't show endpoints for horizontal bar charts

* Add test
When tickDecimals is null adding an extra tickdecimal when range is .25
will fail.

0 - 0.25 - 0.5 - 0.75 - 1 will be incorrectly rounded to 0 - 0.3 - 0.5 - 0.8
* Attempt to remove problem dependency.

* Disable some low-priority misbehaving tests.
…crosecond min tick size (#1802)

This PR addresses two already-reported issues when using micro epoch with the time axis

# 1. Missing ticks when using time axis

The code that resets the time of the first tick does not takes into account the seconds/millis/micro steps:
![image](https://user-images.githubusercontent.com/31401273/155120346-785bcffd-6c0d-4e10-b26b-bbb4daabf69d.png)

This PR adds the following sections to reset the micro and millis when needed:
```javascript
        if (step >= timeUnitSize.millisecond) {
            d.setMicroseconds(0);
        }
        if (step >= timeUnitSize.second) {
            d.setMilliseconds(0);
        }
```

The result after the fix:
![image](https://user-images.githubusercontent.com/31401273/155120515-497f10fe-be9e-4827-96b2-b8f00f7a47d9.png)


This also fixes another issue mentioned here:
#1743

# 2. Infinite loop in dateTickGenerator

Mentioned here:
#1792

In some cases, the date tick generator will run in an infinite loop due to a bug in the custom micro date implementation provided by Flot time plugin. 

In short: The micro epoch is rounded to 3 decimals AFTER setting the date using the default Date.setTime prototype, which means that when the micro epoch is of form 1645527365.999999999, setTime will receive 1645527365 instead of 1645527366. This caused an infinite loop within dateTickGenerator.

This PR fixes this issue by first rounding the micro epoch then calling the Date.setTime original prototype.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.