From 9cac8a92dffcf8470ba49040bd3a0263d1d3abb2 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 21 Jun 2013 09:21:48 +0200 Subject: [PATCH] Set default 'tracking' property to false --- src/ol/deviceorientation.js | 9 +++++++-- src/ol/geolocation.js | 7 +++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ol/deviceorientation.js b/src/ol/deviceorientation.js index 41bdd1b734..1b1b25f09a 100644 --- a/src/ol/deviceorientation.js +++ b/src/ol/deviceorientation.js @@ -27,6 +27,10 @@ ol.DeviceOrientationProperty = { */ ol.DeviceOrientation = function(opt_options) { + goog.base(this); + + var options = goog.isDef(opt_options) ? opt_options : {}; + /** * @private * @type {?number} @@ -37,7 +41,7 @@ ol.DeviceOrientation = function(opt_options) { ol.Object.getChangeEventType(ol.DeviceOrientationProperty.TRACKING), this.handleTrackingChanged_, false, this); - goog.base(this, goog.isDef(opt_options) ? opt_options : {}); + this.setTracking(goog.isDef(options.tracking) ? options.tracking : false); }; goog.inherits(ol.DeviceOrientation, ol.Object); @@ -139,7 +143,8 @@ goog.exportProperty( /** - * @return {boolean|undefined} tracking. + * Are we tracking the device's orientation? + * @return {boolean} tracking. */ ol.DeviceOrientation.prototype.getTracking = function() { return /** @type {boolean} */ ( diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js index f8031a8211..edb908082e 100644 --- a/src/ol/geolocation.js +++ b/src/ol/geolocation.js @@ -86,9 +86,8 @@ ol.Geolocation = function(opt_options) { if (goog.isDef(options.trackingOptions)) { this.setTrackingOptions(options.trackingOptions); } - if (goog.isDef(options.tracking)) { - this.setTracking(options.tracking); - } + + this.setTracking(goog.isDef(options.tracking) ? options.tracking : false); }; goog.inherits(ol.Geolocation, ol.Object); @@ -282,7 +281,7 @@ goog.exportProperty( /** * Are we tracking the user's position? - * @return {boolean|undefined} tracking. + * @return {boolean} tracking. */ ol.Geolocation.prototype.getTracking = function() { return /** @type {boolean} */ (