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
5b966071
Commit
5b966071
authored
Dec 12, 2012
by
David Schnur
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #901 from dnschnur/canvas-float-fix
Removed unnecessary canvas skipPositioning flag.
parents
fa025fab
de86d017
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
NEWS.md
NEWS.md
+3
-0
jquery.flot.js
jquery.flot.js
+5
-7
No files found.
NEWS.md
View file @
5b966071
...
@@ -155,6 +155,9 @@ The base and overlay canvas are now using the CSS classes "flot-base" and
...
@@ -155,6 +155,9 @@ The base and overlay canvas are now using the CSS classes "flot-base" and
-
Prevented several local variables from becoming global. (patch by aaa707)
-
Prevented several local variables from becoming global. (patch by aaa707)
-
Ensure that the overlay and primary canvases remain aligned. (issue #670,
pull request #901)
## Flot 0.7 ##
## Flot 0.7 ##
### API changes ###
### API changes ###
...
...
jquery.flot.js
View file @
5b966071
...
@@ -738,15 +738,13 @@ Licensed under the MIT license.
...
@@ -738,15 +738,13 @@ Licensed under the MIT license.
return
devicePixelRatio
/
backingStoreRatio
;
return
devicePixelRatio
/
backingStoreRatio
;
}
}
function
makeCanvas
(
skipPositioning
,
cls
)
{
function
makeCanvas
(
cls
)
{
var
c
=
document
.
createElement
(
'canvas'
);
var
c
=
document
.
createElement
(
'canvas'
);
c
.
className
=
cls
;
c
.
className
=
cls
;
if
(
!
skipPositioning
)
$
(
c
).
css
({
position
:
'absolute'
,
left
:
0
,
top
:
0
})
$
(
c
).
css
({
position
:
'absolute'
,
left
:
0
,
top
:
0
});
.
appendTo
(
placeholder
);
$
(
c
).
appendTo
(
placeholder
);
// If HTML5 Canvas isn't available, fall back to Excanvas
// If HTML5 Canvas isn't available, fall back to Excanvas
...
@@ -842,8 +840,8 @@ Licensed under the MIT license.
...
@@ -842,8 +840,8 @@ Licensed under the MIT license.
getCanvasDimensions
();
getCanvasDimensions
();
canvas
=
makeCanvas
(
true
,
"flot-base"
);
canvas
=
makeCanvas
(
"flot-base"
);
overlay
=
makeCanvas
(
false
,
"flot-overlay"
);
// overlay canvas for interactive features
overlay
=
makeCanvas
(
"flot-overlay"
);
// overlay canvas for interactive features
reused
=
false
;
reused
=
false
;
}
}
...
...
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