From 87252a73f1188004357ab4129ed45383bf4a3c65 Mon Sep 17 00:00:00 2001 From: tyr Date: Thu, 6 Dec 2012 11:09:09 +0100 Subject: [PATCH] fixed support3d to reuse transformProp. prefixProperty returns false instead of "" when the property isn't supported at all --- js/id/renderer/map.js | 10 ++++------ js/id/util.js | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js index cc754d875..b3e2a54c1 100644 --- a/js/id/renderer/map.js +++ b/js/id/renderer/map.js @@ -57,15 +57,13 @@ iD.Map = function() { support3d = (function() { // test for translate3d support. Based on https://gist.github.com/3794226 by lorenzopolidori and webinista var el = document.createElement('div'), - has3d = false, - transform = iD.util.prefix(['webkit', 'ms', 'Moz']) + 'transform'; + has3d = false; document.body.insertBefore(el,null); - if (el.style[transform] !== undefined) { - el.style[transform] = 'translate3d(1px,1px,1px)'; - has3d = window.getComputedStyle(el).getPropertyValue(transform); + if (el.style[transformProp] !== undefined) { + el.style[transformProp] = 'translate3d(1px,1px,1px)'; + has3d = window.getComputedStyle(el).getPropertyValue(transformProp); } document.body.removeChild(el); - return (has3d && has3d.length>0 && has3d!=="none"); })(), supersurface, surface, defs, tilegroup, r, g, alength; diff --git a/js/id/util.js b/js/id/util.js index 10c230fd4..41e14ede0 100644 --- a/js/id/util.js +++ b/js/id/util.js @@ -70,7 +70,7 @@ iD.util.prefixProperty = function(property) { var i = -1, n = p.length, s = document.body.style; if (property.toLowerCase() in s) return property.toLowerCase(); while (++i < n) if (p[i] + property in s) return '-' + p[i].toLowerCase() + '-' + property.toLowerCase(); - return ''; + return false; })(prefixes); };