diff --git a/examples/bind-input.js b/examples/bind-input.js index dcce625a99..1f0fd6bb1a 100644 --- a/examples/bind-input.js +++ b/examples/bind-input.js @@ -4,7 +4,7 @@ goog.require('ol.View2D'); goog.require('ol.dom.Input'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); if (!ol.webgl.SUPPORTED) { diff --git a/examples/brightness-contrast.js b/examples/brightness-contrast.js index 4a0129c952..d07824fcf6 100644 --- a/examples/brightness-contrast.js +++ b/examples/brightness-contrast.js @@ -3,7 +3,7 @@ goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.MapQuestOpenAerial'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); function setResetBrightnessButtonHTML() { diff --git a/examples/hue-saturation.js b/examples/hue-saturation.js index db601aa679..d0eb5f9ba1 100644 --- a/examples/hue-saturation.js +++ b/examples/hue-saturation.js @@ -4,7 +4,7 @@ goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.proj'); goog.require('ol.source.BingMaps'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); function setResetHueButtonHTML() { diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 7e513999e1..afa8425cc7 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -3,7 +3,7 @@ goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.layer.Tile'); goog.require('ol.source.MapQuestOpenAerial'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); var domMap = new ol.Map({ diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js index 301d34be56..58f59f1bcb 100644 --- a/examples/ten-thousand-points.js +++ b/examples/ten-thousand-points.js @@ -9,7 +9,7 @@ goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector2'); goog.require('ol.source.OSM'); goog.require('ol.source.Vector2'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); // WARNING diff --git a/src/ol/canvas/canvas.exports b/src/ol/canvas/canvas.exports deleted file mode 100644 index dd557e9681..0000000000 --- a/src/ol/canvas/canvas.exports +++ /dev/null @@ -1 +0,0 @@ -@exportSymbol ol.canvas.SUPPORTED diff --git a/src/ol/canvas/canvas.js b/src/ol/canvas/canvas.js index 0cf1dad4a9..266718953d 100644 --- a/src/ol/canvas/canvas.js +++ b/src/ol/canvas/canvas.js @@ -1,5 +1,4 @@ goog.provide('ol.canvas'); -goog.provide('ol.canvas.SUPPORTED'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); diff --git a/src/ol/deviceorientation.exports b/src/ol/deviceorientation.exports index 05be8f4887..6988135399 100644 --- a/src/ol/deviceorientation.exports +++ b/src/ol/deviceorientation.exports @@ -1,2 +1 @@ @exportClass ol.DeviceOrientation ol.DeviceOrientationOptions -@exportSymbol ol.DeviceOrientation.SUPPORTED diff --git a/src/ol/deviceorientation.js b/src/ol/deviceorientation.js index a9660d1119..72b5bb5e18 100644 --- a/src/ol/deviceorientation.js +++ b/src/ol/deviceorientation.js @@ -1,5 +1,4 @@ goog.provide('ol.DeviceOrientation'); -goog.provide('ol.DeviceOrientation.SUPPORTED'); goog.provide('ol.DeviceOrientationProperty'); goog.require('goog.events'); @@ -107,6 +106,10 @@ ol.DeviceOrientation.prototype.disposeInternal = function() { * @type {boolean} */ ol.DeviceOrientation.SUPPORTED = 'DeviceOrientationEvent' in window; +goog.exportProperty( + ol.DeviceOrientation, + 'SUPPORTED', + ol.DeviceOrientation.SUPPORTED); /** diff --git a/src/ol/geolocation.exports b/src/ol/geolocation.exports index 7065040bdc..18d54d9805 100644 --- a/src/ol/geolocation.exports +++ b/src/ol/geolocation.exports @@ -1,2 +1 @@ @exportClass ol.Geolocation ol.GeolocationOptions -@exportSymbol ol.Geolocation.SUPPORTED diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js index 601baf1599..5b7f55f66d 100644 --- a/src/ol/geolocation.js +++ b/src/ol/geolocation.js @@ -1,7 +1,6 @@ // FIXME handle geolocation not supported goog.provide('ol.Geolocation'); -goog.provide('ol.Geolocation.SUPPORTED'); goog.provide('ol.GeolocationProperty'); goog.require('goog.events'); @@ -143,6 +142,10 @@ ol.Geolocation.prototype.handleTrackingChanged_ = function() { * @type {boolean} */ ol.Geolocation.SUPPORTED = 'geolocation' in goog.global.navigator; +goog.exportProperty( + ol.Geolocation, + 'SUPPORTED', + ol.Geolocation.SUPPORTED); /** diff --git a/src/ol/map.js b/src/ol/map.js index f5ac50a136..d19a1c1655 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -58,12 +58,12 @@ goog.require('ol.layer.Group'); goog.require('ol.proj'); goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); +goog.require('ol.renderer.canvas'); goog.require('ol.renderer.canvas.Map'); -goog.require('ol.renderer.canvas.SUPPORTED'); +goog.require('ol.renderer.dom'); goog.require('ol.renderer.dom.Map'); -goog.require('ol.renderer.dom.SUPPORTED'); +goog.require('ol.renderer.webgl'); goog.require('ol.renderer.webgl.Map'); -goog.require('ol.renderer.webgl.SUPPORTED'); goog.require('ol.structs.PriorityQueue'); goog.require('ol.vec.Mat4'); diff --git a/src/ol/renderer/canvas/canvasrenderer.js b/src/ol/renderer/canvas/canvasrenderer.js index 412f4757cd..705283e37f 100644 --- a/src/ol/renderer/canvas/canvasrenderer.js +++ b/src/ol/renderer/canvas/canvasrenderer.js @@ -1,6 +1,6 @@ -goog.provide('ol.renderer.canvas.SUPPORTED'); +goog.provide('ol.renderer.canvas'); -goog.require('ol.canvas.SUPPORTED'); +goog.require('ol.canvas'); /** diff --git a/src/ol/renderer/dom/domrenderer.js b/src/ol/renderer/dom/domrenderer.js index 4585ea8bf6..4f2f98d043 100644 --- a/src/ol/renderer/dom/domrenderer.js +++ b/src/ol/renderer/dom/domrenderer.js @@ -1,4 +1,4 @@ -goog.provide('ol.renderer.dom.SUPPORTED'); +goog.provide('ol.renderer.dom'); /** diff --git a/src/ol/renderer/webgl/webglrenderer.js b/src/ol/renderer/webgl/webglrenderer.js index 3e95ff7e3f..eb1871d9a6 100644 --- a/src/ol/renderer/webgl/webglrenderer.js +++ b/src/ol/renderer/webgl/webglrenderer.js @@ -1,6 +1,6 @@ -goog.provide('ol.renderer.webgl.SUPPORTED'); +goog.provide('ol.renderer.webgl'); -goog.require('ol.webgl.SUPPORTED'); +goog.require('ol.webgl'); /** diff --git a/src/ol/webgl/webgl.exports b/src/ol/webgl/webgl.exports deleted file mode 100644 index e0e5ef70f0..0000000000 --- a/src/ol/webgl/webgl.exports +++ /dev/null @@ -1 +0,0 @@ -@exportSymbol ol.webgl.SUPPORTED diff --git a/src/ol/webgl/webgl.js b/src/ol/webgl/webgl.js index cd785cb5d2..88d7919a54 100644 --- a/src/ol/webgl/webgl.js +++ b/src/ol/webgl/webgl.js @@ -1,5 +1,4 @@ goog.provide('ol.webgl'); -goog.provide('ol.webgl.SUPPORTED'); goog.provide('ol.webgl.WebGLContextEventType'); goog.require('goog.dom'); @@ -64,3 +63,4 @@ ol.webgl.SUPPORTED = (function() { return false; } })(); +goog.exportSymbol('ol.webgl.SUPPORTED', ol.webgl.SUPPORTED);