Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
F
flot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HS-public
flot
Commits
c221fd34
Commit
c221fd34
authored
Jan 05, 2014
by
David Schnur
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1209 from Jeff-Tian/0.9-work
Allow text markings without a solid background.
parents
fc1e4094
59767e65
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
22 deletions
+20
-22
jquery.flot.js
jquery.flot.js
+20
-22
No files found.
jquery.flot.js
View file @
c221fd34
...
...
@@ -2417,16 +2417,13 @@ Licensed under the MIT license.
yrange
.
from
=
Math
.
max
(
yrange
.
from
,
yrange
.
axis
.
min
);
yrange
.
to
=
Math
.
min
(
yrange
.
to
,
yrange
.
axis
.
max
);
if
(
xrange
.
from
===
xrange
.
to
&&
yrange
.
from
===
yrange
.
to
)
{
return
;
}
// then draw
xrange
.
from
=
xrange
.
axis
.
p2c
(
xrange
.
from
);
xrange
.
to
=
xrange
.
axis
.
p2c
(
xrange
.
to
);
yrange
.
from
=
yrange
.
axis
.
p2c
(
yrange
.
from
);
yrange
.
to
=
yrange
.
axis
.
p2c
(
yrange
.
to
);
if
(
xrange
.
from
!==
xrange
.
to
||
xrange
.
from
!==
yrange
.
to
)
{
if
(
xrange
.
from
===
xrange
.
to
||
yrange
.
from
===
yrange
.
to
)
{
// draw line
ctx
.
beginPath
();
...
...
@@ -2448,6 +2445,7 @@ Licensed under the MIT license.
ctx
.
fill
();
}
}
}
if
(
m
.
text
)
{
// left aligned horizontal position:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment