cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support matrix3d as used in IE11

Browse Source
This commit is contained in:
Dave Leaver 2014-03-20 12:42:40 +13:00 committed by Vladimir Agafonkin
parent a34810cb85
commit 0f0d66f3df
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dom/DomUtil.js
View File

@ -146,8 +146,6 @@ L.DomUtil = {
// you can't easily get intermediate values of properties animated with CSS3 Transitions, // you can't easily get intermediate values of properties animated with CSS3 Transitions,
// we need to parse computed style (in case of transform it returns matrix string) // we need to parse computed style (in case of transform it returns matrix string)
_transformRe: /([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,
//Gets the offset and scale of the given element as set by setTransform //Gets the offset and scale of the given element as set by setTransform
getTransform: function (el) { getTransform: function (el) {
//Only handles scale and translate matrices. //Only handles scale and translate matrices.
@ -155,16 +153,25 @@ L.DomUtil = {
//Extract offset and scale from the matrix //Extract offset and scale from the matrix
var style = window.getComputedStyle(el), var style = window.getComputedStyle(el),
matches = style[L.DomUtil.TRANSFORM].match(L.DomUtil._transformRe); split = style[L.DomUtil.TRANSFORM].split(/[\(,\)]/);
if (!matches) { //matrix
return null; if (split.length === 8) {
return {
scale: parseFloat(split[1]),
offset: L.point(parseFloat(split[5]), parseFloat(split[6]))
};
} }
//matrix3d
if (split.length === 18) {
return { return {
scale: parseFloat(matches[1]), scale: parseFloat(split[1]),
offset: L.point(parseFloat(matches[2]), parseFloat(matches[3])) offset: L.point(parseFloat(split[13]), parseFloat(split[14]))
}; };
}
return null;
}, },
setPosition: function (el, point, no3d) { // (HTMLElement, Point[, Boolean]) setPosition: function (el, point, no3d) { // (HTMLElement, Point[, Boolean])