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
51aea346
Commit
51aea346
authored
Apr 16, 2014
by
David Schnur
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1284 from dnschnur/multi-axis-min-fix
Allow x2axis/y2axis with no min/max to auto-scale.
parents
7f906431
86f7ab1e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
+14
-0
jquery.flot.js
jquery.flot.js
+14
-0
No files found.
jquery.flot.js
View file @
51aea346
...
@@ -830,10 +830,24 @@ Licensed under the MIT license.
...
@@ -830,10 +830,24 @@ Licensed under the MIT license.
if
(
options
.
x2axis
)
{
if
(
options
.
x2axis
)
{
options
.
xaxes
[
1
]
=
$
.
extend
(
true
,
{},
options
.
xaxis
,
options
.
x2axis
);
options
.
xaxes
[
1
]
=
$
.
extend
(
true
,
{},
options
.
xaxis
,
options
.
x2axis
);
options
.
xaxes
[
1
].
position
=
"top"
;
options
.
xaxes
[
1
].
position
=
"top"
;
// Override the inherit to allow the axis to auto-scale
if
(
options
.
x2axis
.
min
==
null
)
{
options
.
xaxes
[
1
].
min
=
null
;
}
if
(
options
.
x2axis
.
max
==
null
)
{
options
.
xaxes
[
1
].
max
=
null
;
}
}
}
if
(
options
.
y2axis
)
{
if
(
options
.
y2axis
)
{
options
.
yaxes
[
1
]
=
$
.
extend
(
true
,
{},
options
.
yaxis
,
options
.
y2axis
);
options
.
yaxes
[
1
]
=
$
.
extend
(
true
,
{},
options
.
yaxis
,
options
.
y2axis
);
options
.
yaxes
[
1
].
position
=
"right"
;
options
.
yaxes
[
1
].
position
=
"right"
;
// Override the inherit to allow the axis to auto-scale
if
(
options
.
y2axis
.
min
==
null
)
{
options
.
yaxes
[
1
].
min
=
null
;
}
if
(
options
.
y2axis
.
max
==
null
)
{
options
.
yaxes
[
1
].
max
=
null
;
}
}
}
if
(
options
.
grid
.
coloredAreas
)
if
(
options
.
grid
.
coloredAreas
)
options
.
grid
.
markings
=
options
.
grid
.
coloredAreas
;
options
.
grid
.
markings
=
options
.
grid
.
coloredAreas
;
...
...
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