From 3f0da1100870a37dcce9d332fbccfec919d2d8df Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Wed, 30 Apr 2014 08:24:00 -0600
Subject: [PATCH] Move ol defines from browserfeature.js to ol.js

---
 src/ol/browserfeature.js | 67 +-------------------------------------
 src/ol/ol.js             | 69 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/src/ol/browserfeature.js b/src/ol/browserfeature.js
index b6ab5c1452..f6fadb4007 100644
--- a/src/ol/browserfeature.js
+++ b/src/ol/browserfeature.js
@@ -2,76 +2,11 @@ goog.provide('ol.BrowserFeature');
 
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
-goog.require('goog.userAgent');
+goog.require('ol');
 goog.require('ol.dom');
 goog.require('ol.webgl');
 
 
-/**
- * @define {boolean} Assume touch.
- */
-ol.ASSUME_TOUCH = false;
-
-
-/**
- * @define {boolean} Whether to enable canvas.
- */
-ol.ENABLE_CANVAS = true;
-
-
-/**
- * @define {boolean} Whether to enable DOM.
- */
-ol.ENABLE_DOM = true;
-
-
-/**
- * @define {boolean} Whether to enable rendering of image layers.
- */
-ol.ENABLE_IMAGE = true;
-
-
-/**
- * @define {boolean} Whether to enable rendering of tile layers.
- */
-ol.ENABLE_TILE = true;
-
-
-/**
- * @define {boolean} Whether to enable rendering of vector layers.
- */
-ol.ENABLE_VECTOR = true;
-
-
-/**
- * @define {boolean} Whether to enable WebGL.
- */
-ol.ENABLE_WEBGL = true;
-
-
-/**
- * @define {boolean} Whether to support legacy IE (7-8).
- */
-ol.LEGACY_IE_SUPPORT = false;
-
-
-/**
- * The page is loaded using HTTPS.
- * @const
- * @type {boolean}
- */
-ol.IS_HTTPS = goog.global.location.protocol === 'https:';
-
-
-/**
- * Whether the current browser is legacy IE
- * @const
- * @type {boolean}
- */
-ol.IS_LEGACY_IE = goog.userAgent.IE &&
-    !goog.userAgent.isVersionOrHigher('9.0') && goog.userAgent.VERSION !== '';
-
-
 /**
  * The ratio between physical pixels and device-independent pixels
  * (dips) on the device (`window.devicePixelRatio`).
diff --git a/src/ol/ol.js b/src/ol/ol.js
index e22bd02a73..3a7c355db1 100644
--- a/src/ol/ol.js
+++ b/src/ol/ol.js
@@ -1,9 +1,76 @@
+goog.require('goog.userAgent');
+
 goog.provide('ol');
 
 
+/**
+ * @define {boolean} Assume touch.
+ */
+ol.ASSUME_TOUCH = false;
+
+
+/**
+ * @define {boolean} Whether to enable canvas.
+ */
+ol.ENABLE_CANVAS = true;
+
+
+/**
+ * @define {boolean} Whether to enable DOM.
+ */
+ol.ENABLE_DOM = true;
+
+
+/**
+ * @define {boolean} Whether to enable rendering of image layers.
+ */
+ol.ENABLE_IMAGE = true;
+
+
+/**
+ * @define {boolean} Whether to enable rendering of tile layers.
+ */
+ol.ENABLE_TILE = true;
+
+
+/**
+ * @define {boolean} Whether to enable rendering of vector layers.
+ */
+ol.ENABLE_VECTOR = true;
+
+
+/**
+ * @define {boolean} Whether to enable WebGL.
+ */
+ol.ENABLE_WEBGL = true;
+
+
+/**
+ * @define {boolean} Whether to support legacy IE (7-8).
+ */
+ol.LEGACY_IE_SUPPORT = false;
+
+
+/**
+ * The page is loaded using HTTPS.
+ * @const
+ * @type {boolean}
+ */
+ol.IS_HTTPS = goog.global.location.protocol === 'https:';
+
+
+/**
+ * Whether the current browser is legacy IE
+ * @const
+ * @type {boolean}
+ */
+ol.IS_LEGACY_IE = goog.userAgent.IE &&
+    !goog.userAgent.isVersionOrHigher('9.0') && goog.userAgent.VERSION !== '';
+
+
 /**
  * ol.inherits is an alias to the goog.inherits function. It is exported
- * for use in non-compiled application code. See ol.exports.
+ * for use in non-compiled application code.
  *
  * FIXME: We use a new line to fake the linter. Without the new line the
  * linter complains with: