From 5bb6dbfef3d5e8b0391a80e07271adb8dd4776d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Wed, 18 Dec 2013 11:18:10 +0100 Subject: [PATCH] HAS_CANVAS is false if ENABLE_CANVAS is false --- src/ol/browserfeature.js | 2 +- src/ol/map.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/browserfeature.js b/src/ol/browserfeature.js index 910a2de4de..74ff4b3b79 100644 --- a/src/ol/browserfeature.js +++ b/src/ol/browserfeature.js @@ -45,7 +45,7 @@ ol.BrowserFeature.DEVICE_PIXEL_RATIO = goog.global.devicePixelRatio || 1; * @type {boolean} * @todo stability experimental */ -ol.BrowserFeature.HAS_CANVAS = ( +ol.BrowserFeature.HAS_CANVAS = ol.ENABLE_CANVAS && ( /** * @return {boolean} Canvas supported. */ diff --git a/src/ol/map.js b/src/ol/map.js index 9aa00ada76..51a297ed09 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -1289,7 +1289,7 @@ ol.Map.createOptionsInternal = function(options) { for (i = 0; i < n; ++i) { rendererHint = rendererHints[i]; if (rendererHint == ol.RendererHint.CANVAS) { - if (ol.ENABLE_CANVAS && ol.BrowserFeature.HAS_CANVAS) { + if (ol.BrowserFeature.HAS_CANVAS) { rendererConstructor = ol.renderer.canvas.Map; break; }