From 6e3a5ca7ca243c3a5843db11dd93a1084475ec23 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 2 Sep 2014 15:07:18 +0200 Subject: [PATCH 1/3] Remove unnecessary newlines --- src/ol/has.js | 6 ++---- src/ol/overlay.js | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ol/has.js b/src/ol/has.js index 982156300c..1472c8b53c 100644 --- a/src/ol/has.js +++ b/src/ol/has.js @@ -68,8 +68,7 @@ ol.has.CANVAS = ol.ENABLE_CANVAS && ( * @type {boolean} * @api stable */ -ol.has.DEVICE_ORIENTATION = - 'DeviceOrientationEvent' in goog.global; +ol.has.DEVICE_ORIENTATION = 'DeviceOrientationEvent' in goog.global; /** @@ -111,8 +110,7 @@ ol.has.POINTER = 'PointerEvent' in goog.global; * @const * @type {boolean} */ -ol.has.MSPOINTER = - !!(goog.global.navigator.msPointerEnabled); +ol.has.MSPOINTER = !!(goog.global.navigator.msPointerEnabled); /** diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 038dc0b02b..9f569b6e97 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -129,8 +129,7 @@ ol.Overlay = function(options) { this.handlePositionChanged, false, this); goog.events.listen( - this, - ol.Object.getChangeEventType(ol.OverlayProperty.POSITIONING), + this, ol.Object.getChangeEventType(ol.OverlayProperty.POSITIONING), this.handlePositioningChanged, false, this); if (goog.isDef(options.element)) { From aaeb2b6938679ee5861871a427ba5e1987833a17 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 3 Sep 2014 14:28:03 +0200 Subject: [PATCH 2/3] Remove unnecessary parentheses --- src/ol/interaction/modifyinteraction.js | 2 +- src/ol/interaction/selectinteraction.js | 2 +- src/ol/layer/layer.js | 4 ++-- src/ol/layer/layergroup.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index a56a212c3d..68b508a039 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -112,7 +112,7 @@ ol.interaction.Modify = function(options) { * @private */ this.overlay_ = new ol.FeatureOverlay({ - style: (goog.isDef(options.style)) ? options.style : + style: goog.isDef(options.style) ? options.style : ol.interaction.Modify.getDefaultStyleFunction() }); diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index 545e37f2bf..5c4067e3db 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -90,7 +90,7 @@ ol.interaction.Select = function(opt_options) { * @type {ol.FeatureOverlay} */ this.featureOverlay_ = new ol.FeatureOverlay({ - style: (goog.isDef(options.style)) ? options.style : + style: goog.isDef(options.style) ? options.style : ol.interaction.Select.getDefaultStyleFunction() }); diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index ac9d992406..3ce78653d9 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -62,7 +62,7 @@ ol.layer.Layer.visibleAtResolution = function(layerState, resolution) { * @inheritDoc */ ol.layer.Layer.prototype.getLayersArray = function(opt_array) { - var array = (goog.isDef(opt_array)) ? opt_array : []; + var array = goog.isDef(opt_array) ? opt_array : []; array.push(this); return array; }; @@ -72,7 +72,7 @@ ol.layer.Layer.prototype.getLayersArray = function(opt_array) { * @inheritDoc */ ol.layer.Layer.prototype.getLayerStatesArray = function(opt_states) { - var states = (goog.isDef(opt_states)) ? opt_states : []; + var states = goog.isDef(opt_states) ? opt_states : []; states.push(this.getLayerState()); return states; }; diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 1cabc5e843..86dc1042f5 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -179,7 +179,7 @@ goog.exportProperty( * @inheritDoc */ ol.layer.Group.prototype.getLayersArray = function(opt_array) { - var array = (goog.isDef(opt_array)) ? opt_array : []; + var array = goog.isDef(opt_array) ? opt_array : []; this.getLayers().forEach(function(layer) { layer.getLayersArray(array); }); @@ -191,7 +191,7 @@ ol.layer.Group.prototype.getLayersArray = function(opt_array) { * @inheritDoc */ ol.layer.Group.prototype.getLayerStatesArray = function(opt_states) { - var states = (goog.isDef(opt_states)) ? opt_states : []; + var states = goog.isDef(opt_states) ? opt_states : []; var pos = states.length; From 98ceee5d280283ec6771033ac3642fcd9dad43c5 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 9 Sep 2014 16:05:18 +0200 Subject: [PATCH 3/3] Fix documentation typo --- src/ol/ol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/ol.js b/src/ol/ol.js index 614113f890..2af3b89101 100644 --- a/src/ol/ol.js +++ b/src/ol/ol.js @@ -73,7 +73,7 @@ ol.DRAGZOOM_ANIMATION_DURATION = 200; /** - * @define {number} Hysterisis pixels. + * @define {number} Hysteresis pixels. */ ol.DRAG_BOX_HYSTERESIS_PIXELS = 8;