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
e3540717
Commit
e3540717
authored
Mar 03, 2013
by
David Schnur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor cleanup of text-style color defaults.
parent
a2dd0645
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
jquery.flot.js
jquery.flot.js
+15
-5
No files found.
jquery.flot.js
View file @
e3540717
...
@@ -34,16 +34,20 @@ Licensed under the MIT license.
...
@@ -34,16 +34,20 @@ Licensed under the MIT license.
// the actual Flot code
// the actual Flot code
(
function
(
$
)
{
(
function
(
$
)
{
// Cache the prototype hasOwnProperty for faster access
var
hasOwnProperty
=
Object
.
prototype
.
hasOwnProperty
;
// Add default styles for tick labels and other text
// Add default styles for tick labels and other text
var
STYLES
=
[
".flot-tick-label {font-size:smaller;color:#545454;}"
];
$
(
function
()
{
$
(
function
()
{
$
(
"head"
).
prepend
(
"<style id='flot-default-styles'>
.flot-tick-label {font-size:smaller;color:#545454;}
</style>"
);
$
(
"head"
).
prepend
(
"<style id='flot-default-styles'>
"
+
STYLES
.
join
(
""
)
+
"
</style>"
);
});
});
// Cache the prototype hasOwnProperty for faster access
var
hasOwnProperty
=
Object
.
prototype
.
hasOwnProperty
;
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// The Canvas object is a wrapper around an HTML5 <canvas> tag.
// The Canvas object is a wrapper around an HTML5 <canvas> tag.
//
//
...
@@ -668,6 +672,9 @@ Licensed under the MIT license.
...
@@ -668,6 +672,9 @@ Licensed under the MIT license.
options
.
xaxes
[
i
]
=
axisOptions
;
options
.
xaxes
[
i
]
=
axisOptions
;
if
(
axisOptions
.
font
)
{
if
(
axisOptions
.
font
)
{
axisOptions
.
font
=
$
.
extend
({},
fontDefaults
,
axisOptions
.
font
);
axisOptions
.
font
=
$
.
extend
({},
fontDefaults
,
axisOptions
.
font
);
if
(
!
axisOptions
.
font
.
color
)
{
axisOptions
.
font
.
color
=
axisOptions
.
color
;
}
}
}
}
}
...
@@ -677,6 +684,9 @@ Licensed under the MIT license.
...
@@ -677,6 +684,9 @@ Licensed under the MIT license.
options
.
yaxes
[
i
]
=
axisOptions
;
options
.
yaxes
[
i
]
=
axisOptions
;
if
(
axisOptions
.
font
)
{
if
(
axisOptions
.
font
)
{
axisOptions
.
font
=
$
.
extend
({},
fontDefaults
,
axisOptions
.
font
);
axisOptions
.
font
=
$
.
extend
({},
fontDefaults
,
axisOptions
.
font
);
if
(
!
axisOptions
.
font
.
color
)
{
axisOptions
.
font
.
color
=
axisOptions
.
color
;
}
}
}
}
}
...
...
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