Rename ol.*.isSupported function to ol.*.SUPPORTED const

This commit is contained in:
Frederic Junod
2013-02-19 16:14:37 +01:00
parent a55a6bda3b
commit 7e3dcf36a0
6 changed files with 26 additions and 23 deletions

View File

@@ -5,9 +5,10 @@ goog.require('goog.dom.TagName');
/** /**
* @return {boolean} Is supported. * @const
* @type {boolean} Is supported.
*/ */
ol.canvas.isSupported = function() { ol.canvas.SUPPORTED = (function() {
if (!('HTMLCanvasElement' in goog.global)) { if (!('HTMLCanvasElement' in goog.global)) {
return false; return false;
} }
@@ -18,4 +19,4 @@ ol.canvas.isSupported = function() {
} catch (e) { } catch (e) {
return false; return false;
} }
}; })();

View File

@@ -58,11 +58,11 @@ goog.require('ol.interaction.condition');
goog.require('ol.layer.Layer'); goog.require('ol.layer.Layer');
goog.require('ol.renderer.Map'); goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.Map'); goog.require('ol.renderer.canvas.Map');
goog.require('ol.renderer.canvas.isSupported'); goog.require('ol.renderer.canvas.SUPPORTED');
goog.require('ol.renderer.dom.Map'); goog.require('ol.renderer.dom.Map');
goog.require('ol.renderer.dom.isSupported'); goog.require('ol.renderer.dom.SUPPORTED');
goog.require('ol.renderer.webgl.Map'); goog.require('ol.renderer.webgl.Map');
goog.require('ol.renderer.webgl.isSupported'); goog.require('ol.renderer.webgl.SUPPORTED');
/** /**
@@ -857,17 +857,17 @@ ol.Map.createOptionsInternal = function(mapOptions) {
for (i = 0; i < rendererHints.length; ++i) { for (i = 0; i < rendererHints.length; ++i) {
rendererHint = rendererHints[i]; rendererHint = rendererHints[i];
if (rendererHint == ol.RendererHint.CANVAS) { if (rendererHint == ol.RendererHint.CANVAS) {
if (ol.ENABLE_CANVAS && ol.renderer.canvas.isSupported()) { if (ol.ENABLE_CANVAS && ol.renderer.canvas.SUPPORTED) {
rendererConstructor = ol.renderer.canvas.Map; rendererConstructor = ol.renderer.canvas.Map;
break; break;
} }
} else if (rendererHint == ol.RendererHint.DOM) { } else if (rendererHint == ol.RendererHint.DOM) {
if (ol.ENABLE_DOM && ol.renderer.dom.isSupported()) { if (ol.ENABLE_DOM && ol.renderer.dom.SUPPORTED) {
rendererConstructor = ol.renderer.dom.Map; rendererConstructor = ol.renderer.dom.Map;
break; break;
} }
} else if (rendererHint == ol.RendererHint.WEBGL) { } else if (rendererHint == ol.RendererHint.WEBGL) {
if (ol.ENABLE_WEBGL && ol.renderer.webgl.isSupported()) { if (ol.ENABLE_WEBGL && ol.renderer.webgl.SUPPORTED) {
rendererConstructor = ol.renderer.webgl.Map; rendererConstructor = ol.renderer.webgl.Map;
break; break;
} }

View File

@@ -1,9 +1,10 @@
goog.provide('ol.renderer.canvas.isSupported'); goog.provide('ol.renderer.canvas.SUPPORTED');
goog.require('ol.canvas'); goog.require('ol.canvas');
/** /**
* @return {boolean} Is supported. * @const
* @type {boolean} Is supported.
*/ */
ol.renderer.canvas.isSupported = ol.canvas.isSupported; ol.renderer.canvas.SUPPORTED = ol.canvas.SUPPORTED;

View File

@@ -1,9 +1,8 @@
goog.provide('ol.renderer.dom.isSupported'); goog.provide('ol.renderer.dom.SUPPORTED');
goog.require('goog.functions');
/** /**
* @return {boolean} Is supported. * @const
* @type {boolean} Is supported.
*/ */
ol.renderer.dom.isSupported = goog.functions.TRUE; ol.renderer.dom.SUPPORTED = true;

View File

@@ -1,9 +1,10 @@
goog.provide('ol.renderer.webgl.isSupported'); goog.provide('ol.renderer.webgl.SUPPORTED');
goog.require('ol.webgl'); goog.require('ol.webgl');
/** /**
* @return {boolean} Is supported. * @const
* @type {boolean} Is supported.
*/ */
ol.renderer.webgl.isSupported = ol.webgl.isSupported; ol.renderer.webgl.SUPPORTED = ol.webgl.SUPPORTED;

View File

@@ -45,9 +45,10 @@ ol.webgl.getContext = function(canvas, opt_attributes) {
/** /**
* @return {boolean} Is supported. * @const
* @type {boolean} Is supported.
*/ */
ol.webgl.isSupported = function() { ol.webgl.SUPPORTED = (function() {
if (!('WebGLRenderingContext' in goog.global)) { if (!('WebGLRenderingContext' in goog.global)) {
return false; return false;
} }
@@ -57,4 +58,4 @@ ol.webgl.isSupported = function() {
} catch (e) { } catch (e) {
return false; return false;
} }
}; })();