diff --git a/src/ol/centerconstraint.js b/src/ol/centerconstraint.js
index 17788495d8..abb55e654d 100644
--- a/src/ol/centerconstraint.js
+++ b/src/ol/centerconstraint.js
@@ -9,10 +9,10 @@ goog.require('ol.math');
  */
 ol.CenterConstraint.createExtent = function(extent) {
   return (
-  /**
-       * @param {ol.Coordinate|undefined} center Center.
-       * @return {ol.Coordinate|undefined} Center.
-       */
+    /**
+     * @param {ol.Coordinate|undefined} center Center.
+     * @return {ol.Coordinate|undefined} Center.
+     */
     function(center) {
       if (center) {
         return [
diff --git a/src/ol/color.js b/src/ol/color.js
index 3726729518..ca8fca14b4 100644
--- a/src/ol/color.js
+++ b/src/ol/color.js
@@ -79,26 +79,26 @@ ol.color.fromString = (
     // arbitrary 25% of the entries.
 
     /**
-       * @const
-       * @type {number}
-       */
+     * @const
+     * @type {number}
+     */
     var MAX_CACHE_SIZE = 1024;
 
     /**
-       * @type {Object.<string, ol.Color>}
-       */
+     * @type {Object.<string, ol.Color>}
+     */
     var cache = {};
 
     /**
-       * @type {number}
-       */
+     * @type {number}
+     */
     var cacheSize = 0;
 
     return (
-    /**
-           * @param {string} s String.
-           * @return {ol.Color} Color.
-           */
+      /**
+       * @param {string} s String.
+       * @return {ol.Color} Color.
+       */
       function(s) {
         var color;
         if (cache.hasOwnProperty(s)) {
diff --git a/src/ol/colorlike.js b/src/ol/colorlike.js
index c00ec5ab5d..07f1e16960 100644
--- a/src/ol/colorlike.js
+++ b/src/ol/colorlike.js
@@ -24,7 +24,7 @@ ol.colorlike.asColorLike = function(color) {
 ol.colorlike.isColorLike = function(color) {
   return (
     typeof color === 'string' ||
-      color instanceof CanvasPattern ||
-      color instanceof CanvasGradient
+    color instanceof CanvasPattern ||
+    color instanceof CanvasGradient
   );
 };
diff --git a/src/ol/coordinate.js b/src/ol/coordinate.js
index af16fad021..42c324fd09 100644
--- a/src/ol/coordinate.js
+++ b/src/ol/coordinate.js
@@ -121,10 +121,10 @@ ol.coordinate.closestOnSegment = function(coordinate, segment) {
  */
 ol.coordinate.createStringXY = function(opt_fractionDigits) {
   return (
-  /**
-       * @param {ol.Coordinate|undefined} coordinate Coordinate.
-       * @return {string} String XY.
-       */
+    /**
+     * @param {ol.Coordinate|undefined} coordinate Coordinate.
+     * @return {string} String XY.
+     */
     function(coordinate) {
       return ol.coordinate.toStringXY(coordinate, opt_fractionDigits);
     });
diff --git a/src/ol/events/event.js b/src/ol/events/event.js
index cee7aa9b61..c7c7713ba8 100644
--- a/src/ol/events/event.js
+++ b/src/ol/events/event.js
@@ -47,12 +47,12 @@ ol.events.Event = function(type) {
  */
 ol.events.Event.prototype.preventDefault =
 
-/**
- * Stop event propagation.
- * @function
- * @override
- * @api
- */
+  /**
+   * Stop event propagation.
+   * @function
+   * @override
+   * @api
+   */
   ol.events.Event.prototype.stopPropagation = function() {
     this.propagationStopped = true;
   };
diff --git a/src/ol/featureloader.js b/src/ol/featureloader.js
index 45f46696ae..2441e4bc6e 100644
--- a/src/ol/featureloader.js
+++ b/src/ol/featureloader.js
@@ -18,12 +18,12 @@ goog.require('ol.xml');
  */
 ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
   return (
-  /**
-       * @param {ol.Extent} extent Extent.
-       * @param {number} resolution Resolution.
-       * @param {ol.proj.Projection} projection Projection.
-       * @this {ol.source.Vector|ol.VectorTile}
-       */
+    /**
+     * @param {ol.Extent} extent Extent.
+     * @param {number} resolution Resolution.
+     * @param {ol.proj.Projection} projection Projection.
+     * @this {ol.source.Vector|ol.VectorTile}
+     */
     function(extent, resolution, projection) {
       var xhr = new XMLHttpRequest();
       xhr.open('GET',
@@ -33,9 +33,9 @@ ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
         xhr.responseType = 'arraybuffer';
       }
       /**
-         * @param {Event} event Event.
-         * @private
-         */
+       * @param {Event} event Event.
+       * @private
+       */
       xhr.onload = function(event) {
         // status will be 0 for file:// urls
         if (!xhr.status || xhr.status >= 200 && xhr.status < 300) {
@@ -65,8 +65,8 @@ ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
         }
       }.bind(this);
       /**
-         * @private
-         */
+       * @private
+       */
       xhr.onerror = function() {
         failure.call(this);
       }.bind(this);
diff --git a/src/ol/format/esrijson.js b/src/ol/format/esrijson.js
index 474494eb99..b118465627 100644
--- a/src/ol/format/esrijson.js
+++ b/src/ol/format/esrijson.js
@@ -121,9 +121,11 @@ ol.format.EsriJSON.convertRings_ = function(rings, layout) {
     // loop over all outer rings and see if they contain our hole.
     for (i = outerRings.length - 1; i >= 0; i--) {
       var outerRing = outerRings[i][0];
-      if (ol.extent.containsExtent(new ol.geom.LinearRing(
-          outerRing).getExtent(),
-      new ol.geom.LinearRing(hole).getExtent())) {
+      var containsHole = ol.extent.containsExtent(
+          new ol.geom.LinearRing(outerRing).getExtent(),
+          new ol.geom.LinearRing(hole).getExtent()
+      );
+      if (containsHole) {
         // the hole is contained push it into our polygon
         outerRings[i].push(hole);
         matched = true;
diff --git a/src/ol/graticule.js b/src/ol/graticule.js
index e31668dd0a..11c5e14af9 100644
--- a/src/ol/graticule.js
+++ b/src/ol/graticule.js
@@ -24,88 +24,88 @@ ol.Graticule = function(opt_options) {
   var options = opt_options || {};
 
   /**
-  * @type {ol.Map}
-  * @private
-  */
+   * @type {ol.Map}
+   * @private
+   */
   this.map_ = null;
 
   /**
-  * @type {ol.proj.Projection}
-  * @private
-  */
+   * @type {ol.proj.Projection}
+   * @private
+   */
   this.projection_ = null;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.maxLat_ = Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.maxLon_ = Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.minLat_ = -Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.minLon_ = -Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.maxLatP_ = Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.maxLonP_ = Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.minLatP_ = -Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.minLonP_ = -Infinity;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.targetSize_ = options.targetSize !== undefined ?
     options.targetSize : 100;
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.maxLines_ = options.maxLines !== undefined ? options.maxLines : 100;
 
   /**
-  * @type {Array.<ol.geom.LineString>}
-  * @private
-  */
+   * @type {Array.<ol.geom.LineString>}
+   * @private
+   */
   this.meridians_ = [];
 
   /**
-  * @type {Array.<ol.geom.LineString>}
-  * @private
-  */
+   * @type {Array.<ol.geom.LineString>}
+   * @private
+   */
   this.parallels_ = [];
 
   /**
diff --git a/src/ol/has.js b/src/ol/has.js
index e70c4a0798..e396a1dfc1 100644
--- a/src/ol/has.js
+++ b/src/ol/has.js
@@ -57,8 +57,8 @@ ol.has.CANVAS_LINE_DASH = false;
  */
 ol.has.CANVAS = ol.ENABLE_CANVAS && (
   /**
-     * @return {boolean} Canvas supported.
-     */
+   * @return {boolean} Canvas supported.
+   */
   function() {
     if (!('HTMLCanvasElement' in window)) {
       return false;
diff --git a/src/ol/interaction/select.js b/src/ol/interaction/select.js
index a55a5fad55..483884c811 100644
--- a/src/ol/interaction/select.js
+++ b/src/ol/interaction/select.js
@@ -217,11 +217,12 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
     // the pixel.
     ol.obj.clear(this.featureLayerAssociation_);
     map.forEachFeatureAtPixel(mapBrowserEvent.pixel,
-        (/**
-         * @param {ol.Feature|ol.render.Feature} feature Feature.
-         * @param {ol.layer.Layer} layer Layer.
-         * @return {boolean|undefined} Continue to iterate over the features.
-         */
+        (
+          /**
+           * @param {ol.Feature|ol.render.Feature} feature Feature.
+           * @param {ol.layer.Layer} layer Layer.
+           * @return {boolean|undefined} Continue to iterate over the features.
+           */
           function(feature, layer) {
             if (this.filter_(feature, layer)) {
               selected.push(feature);
@@ -250,11 +251,12 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
   } else {
     // Modify the currently selected feature(s).
     map.forEachFeatureAtPixel(mapBrowserEvent.pixel,
-        (/**
-         * @param {ol.Feature|ol.render.Feature} feature Feature.
-         * @param {ol.layer.Layer} layer Layer.
-         * @return {boolean|undefined} Continue to iterate over the features.
-         */
+        (
+          /**
+           * @param {ol.Feature|ol.render.Feature} feature Feature.
+           * @param {ol.layer.Layer} layer Layer.
+           * @return {boolean|undefined} Continue to iterate over the features.
+           */
           function(feature, layer) {
             if (this.filter_(feature, layer)) {
               if ((add || toggle) &&
diff --git a/src/ol/layer/vector.js b/src/ol/layer/vector.js
index 3882958e36..0f24ad9853 100644
--- a/src/ol/layer/vector.js
+++ b/src/ol/layer/vector.js
@@ -35,39 +35,39 @@ ol.layer.Vector = function(opt_options) {
   ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
 
   /**
-  * @type {number}
-  * @private
-  */
+   * @type {number}
+   * @private
+   */
   this.renderBuffer_ = options.renderBuffer !== undefined ?
     options.renderBuffer : 100;
 
   /**
-  * User provided style.
-  * @type {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
-  * @private
-  */
+   * User provided style.
+   * @type {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
+   * @private
+   */
   this.style_ = null;
 
   /**
-  * Style function for use within the library.
-  * @type {ol.StyleFunction|undefined}
-  * @private
-  */
+   * Style function for use within the library.
+   * @type {ol.StyleFunction|undefined}
+   * @private
+   */
   this.styleFunction_ = undefined;
 
   this.setStyle(options.style);
 
   /**
-  * @type {boolean}
-  * @private
-  */
+   * @type {boolean}
+   * @private
+   */
   this.updateWhileAnimating_ = options.updateWhileAnimating !== undefined ?
     options.updateWhileAnimating : false;
 
   /**
-  * @type {boolean}
-  * @private
-  */
+   * @type {boolean}
+   * @private
+   */
   this.updateWhileInteracting_ = options.updateWhileInteracting !== undefined ?
     options.updateWhileInteracting : false;
 };
diff --git a/src/ol/proj.js b/src/ol/proj.js
index fa5bdb3e7f..b75e5c4715 100644
--- a/src/ol/proj.js
+++ b/src/ol/proj.js
@@ -221,12 +221,12 @@ ol.proj.addCoordinateTransforms = function(source, destination, forward, inverse
  */
 ol.proj.createTransformFromCoordinateTransform = function(transform) {
   return (
-  /**
-       * @param {Array.<number>} input Input.
-       * @param {Array.<number>=} opt_output Output.
-       * @param {number=} opt_dimension Dimension.
-       * @return {Array.<number>} Output.
-       */
+    /**
+     * @param {Array.<number>} input Input.
+     * @param {Array.<number>=} opt_output Output.
+     * @param {number=} opt_dimension Dimension.
+     * @return {Array.<number>} Output.
+     */
     function(input, opt_output, opt_dimension) {
       var length = input.length;
       var dimension = opt_dimension !== undefined ? opt_dimension : 2;
diff --git a/src/ol/proj/projection.js b/src/ol/proj/projection.js
index 21f8db7841..85edc64cef 100644
--- a/src/ol/proj/projection.js
+++ b/src/ol/proj/projection.js
@@ -37,65 +37,65 @@ goog.require('ol.proj.proj4');
  */
 ol.proj.Projection = function(options) {
   /**
-  * @private
-  * @type {string}
-  */
+   * @private
+   * @type {string}
+   */
   this.code_ = options.code;
 
   /**
-  * @private
-  * @type {ol.proj.Units}
-  */
+   * @private
+   * @type {ol.proj.Units}
+   */
   this.units_ = /** @type {ol.proj.Units} */ (options.units);
 
   /**
-  * @private
-  * @type {ol.Extent}
-  */
+   * @private
+   * @type {ol.Extent}
+   */
   this.extent_ = options.extent !== undefined ? options.extent : null;
 
   /**
-  * @private
-  * @type {ol.Extent}
-  */
+   * @private
+   * @type {ol.Extent}
+   */
   this.worldExtent_ = options.worldExtent !== undefined ?
     options.worldExtent : null;
 
   /**
-  * @private
-  * @type {string}
-  */
+   * @private
+   * @type {string}
+   */
   this.axisOrientation_ = options.axisOrientation !== undefined ?
     options.axisOrientation : 'enu';
 
   /**
-  * @private
-  * @type {boolean}
-  */
+   * @private
+   * @type {boolean}
+   */
   this.global_ = options.global !== undefined ? options.global : false;
 
   /**
-  * @private
-  * @type {boolean}
-  */
+   * @private
+   * @type {boolean}
+   */
   this.canWrapX_ = !!(this.global_ && this.extent_);
 
   /**
- * @private
- * @type {function(number, ol.Coordinate):number|undefined}
- */
+   * @private
+   * @type {function(number, ol.Coordinate):number|undefined}
+   */
   this.getPointResolutionFunc_ = options.getPointResolution;
 
   /**
-  * @private
-  * @type {ol.tilegrid.TileGrid}
-  */
+   * @private
+   * @type {ol.tilegrid.TileGrid}
+   */
   this.defaultTileGrid_ = null;
 
   /**
-  * @private
-  * @type {number|undefined}
-  */
+   * @private
+   * @type {number|undefined}
+   */
   this.metersPerUnit_ = options.metersPerUnit;
 
   var code = options.code;
diff --git a/src/ol/render/webgl/circlereplay/defaultshader.js b/src/ol/render/webgl/circlereplay/defaultshader.js
index 6da5615e37..a50f1c9615 100644
--- a/src/ol/render/webgl/circlereplay/defaultshader.js
+++ b/src/ol/render/webgl/circlereplay/defaultshader.js
@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.circlereplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.circlereplay.defaultshader.Fragment.DEBUG_SOURCE :
-    ol.render.webgl.circlereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
+      ol.render.webgl.circlereplay.defaultshader.Fragment.DEBUG_SOURCE :
+      ol.render.webgl.circlereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.circlereplay.defaultshader.fragment = new ol.render.webgl.circlereplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.circlereplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.circlereplay.defaultshader.Vertex.DEBUG_SOURCE :
-    ol.render.webgl.circlereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
+      ol.render.webgl.circlereplay.defaultshader.Vertex.DEBUG_SOURCE :
+      ol.render.webgl.circlereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.circlereplay.defaultshader.vertex = new ol.render.webgl.circlereplay.defaultshader.Vertex();
diff --git a/src/ol/render/webgl/imagereplay/defaultshader.js b/src/ol/render/webgl/imagereplay/defaultshader.js
index ee5fef2ea4..92e91c74a1 100644
--- a/src/ol/render/webgl/imagereplay/defaultshader.js
+++ b/src/ol/render/webgl/imagereplay/defaultshader.js
@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE :
-    ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
+      ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE :
+      ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.imagereplay.defaultshader.fragment = new ol.render.webgl.imagereplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE :
-    ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
+      ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE :
+      ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.imagereplay.defaultshader.vertex = new ol.render.webgl.imagereplay.defaultshader.Vertex();
diff --git a/src/ol/render/webgl/linestringreplay/defaultshader.js b/src/ol/render/webgl/linestringreplay/defaultshader.js
index d355e0194c..02e1994f00 100644
--- a/src/ol/render/webgl/linestringreplay/defaultshader.js
+++ b/src/ol/render/webgl/linestringreplay/defaultshader.js
@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.linestringreplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.linestringreplay.defaultshader.Fragment.DEBUG_SOURCE :
-    ol.render.webgl.linestringreplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
+      ol.render.webgl.linestringreplay.defaultshader.Fragment.DEBUG_SOURCE :
+      ol.render.webgl.linestringreplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.linestringreplay.defaultshader.fragment = new ol.render.webgl.linestringreplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.linestringreplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.linestringreplay.defaultshader.Vertex.DEBUG_SOURCE :
-    ol.render.webgl.linestringreplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
+      ol.render.webgl.linestringreplay.defaultshader.Vertex.DEBUG_SOURCE :
+      ol.render.webgl.linestringreplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.linestringreplay.defaultshader.vertex = new ol.render.webgl.linestringreplay.defaultshader.Vertex();
diff --git a/src/ol/render/webgl/polygonreplay/defaultshader.js b/src/ol/render/webgl/polygonreplay/defaultshader.js
index 46db42c7cb..ccd978d93a 100644
--- a/src/ol/render/webgl/polygonreplay/defaultshader.js
+++ b/src/ol/render/webgl/polygonreplay/defaultshader.js
@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.polygonreplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.polygonreplay.defaultshader.Fragment.DEBUG_SOURCE :
-    ol.render.webgl.polygonreplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
+      ol.render.webgl.polygonreplay.defaultshader.Fragment.DEBUG_SOURCE :
+      ol.render.webgl.polygonreplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.polygonreplay.defaultshader.fragment = new ol.render.webgl.polygonreplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.render.webgl.polygonreplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
-    ol.render.webgl.polygonreplay.defaultshader.Vertex.DEBUG_SOURCE :
-    ol.render.webgl.polygonreplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
+      ol.render.webgl.polygonreplay.defaultshader.Vertex.DEBUG_SOURCE :
+      ol.render.webgl.polygonreplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
 
 
   ol.render.webgl.polygonreplay.defaultshader.vertex = new ol.render.webgl.polygonreplay.defaultshader.Vertex();
diff --git a/src/ol/renderer/layer.js b/src/ol/renderer/layer.js
index ebccbdc8c3..a5745e1377 100644
--- a/src/ol/renderer/layer.js
+++ b/src/ol/renderer/layer.js
@@ -66,11 +66,11 @@ ol.renderer.Layer.prototype.hasFeatureAtCoordinate = ol.functions.FALSE;
  */
 ol.renderer.Layer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
   return (
-  /**
-       * @param {number} zoom Zoom level.
-       * @param {ol.TileRange} tileRange Tile range.
-       * @return {boolean} The tile range is fully loaded.
-       */
+    /**
+     * @param {number} zoom Zoom level.
+     * @param {ol.TileRange} tileRange Tile range.
+     * @return {boolean} The tile range is fully loaded.
+     */
     function(zoom, tileRange) {
       function callback(tile) {
         if (!tiles[zoom]) {
diff --git a/src/ol/renderer/webgl/defaultmapshader.js b/src/ol/renderer/webgl/defaultmapshader.js
index d315b01b1e..9598567205 100644
--- a/src/ol/renderer/webgl/defaultmapshader.js
+++ b/src/ol/renderer/webgl/defaultmapshader.js
@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.renderer.webgl.defaultmapshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
-    ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE :
-    ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE;
+      ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE :
+      ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE;
 
 
   ol.renderer.webgl.defaultmapshader.fragment = new ol.renderer.webgl.defaultmapshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.renderer.webgl.defaultmapshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
-    ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE :
-    ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE;
+      ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE :
+      ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE;
 
 
   ol.renderer.webgl.defaultmapshader.vertex = new ol.renderer.webgl.defaultmapshader.Vertex();
diff --git a/src/ol/renderer/webgl/tilelayer.js b/src/ol/renderer/webgl/tilelayer.js
index f75454ac22..8763ef785e 100644
--- a/src/ol/renderer/webgl/tilelayer.js
+++ b/src/ol/renderer/webgl/tilelayer.js
@@ -103,11 +103,11 @@ if (ol.ENABLE_WEBGL) {
     var mapRenderer = this.mapRenderer;
 
     return (
-    /**
-         * @param {number} zoom Zoom level.
-         * @param {ol.TileRange} tileRange Tile range.
-         * @return {boolean} The tile range is fully loaded.
-         */
+      /**
+       * @param {number} zoom Zoom level.
+       * @param {ol.TileRange} tileRange Tile range.
+       * @return {boolean} The tile range is fully loaded.
+       */
       function(zoom, tileRange) {
         function callback(tile) {
           var loaded = mapRenderer.isTileTextureLoaded(tile);
diff --git a/src/ol/renderer/webgl/tilelayershader.js b/src/ol/renderer/webgl/tilelayershader.js
index c97eeb56d0..1fcd190c54 100644
--- a/src/ol/renderer/webgl/tilelayershader.js
+++ b/src/ol/renderer/webgl/tilelayershader.js
@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.renderer.webgl.tilelayershader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
-    ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE :
-    ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE;
+      ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE :
+      ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE;
 
 
   ol.renderer.webgl.tilelayershader.fragment = new ol.renderer.webgl.tilelayershader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
    * @type {string}
    */
   ol.renderer.webgl.tilelayershader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
-    ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE :
-    ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE;
+      ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE :
+      ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE;
 
 
   ol.renderer.webgl.tilelayershader.vertex = new ol.renderer.webgl.tilelayershader.Vertex();
diff --git a/src/ol/resolutionconstraint.js b/src/ol/resolutionconstraint.js
index 93fb97f7fe..32bc069eea 100644
--- a/src/ol/resolutionconstraint.js
+++ b/src/ol/resolutionconstraint.js
@@ -10,12 +10,12 @@ goog.require('ol.math');
  */
 ol.ResolutionConstraint.createSnapToResolutions = function(resolutions) {
   return (
-  /**
-       * @param {number|undefined} resolution Resolution.
-       * @param {number} delta Delta.
-       * @param {number} direction Direction.
-       * @return {number|undefined} Resolution.
-       */
+    /**
+     * @param {number|undefined} resolution Resolution.
+     * @param {number} delta Delta.
+     * @param {number} direction Direction.
+     * @return {number|undefined} Resolution.
+     */
     function(resolution, delta, direction) {
       if (resolution !== undefined) {
         var z =
@@ -43,12 +43,12 @@ ol.ResolutionConstraint.createSnapToResolutions = function(resolutions) {
  */
 ol.ResolutionConstraint.createSnapToPower = function(power, maxResolution, opt_maxLevel) {
   return (
-  /**
-       * @param {number|undefined} resolution Resolution.
-       * @param {number} delta Delta.
-       * @param {number} direction Direction.
-       * @return {number|undefined} Resolution.
-       */
+    /**
+     * @param {number|undefined} resolution Resolution.
+     * @param {number} delta Delta.
+     * @param {number} direction Direction.
+     * @return {number|undefined} Resolution.
+     */
     function(resolution, delta, direction) {
       if (resolution !== undefined) {
         var offset = -direction / 2 + 0.5;
diff --git a/src/ol/rotationconstraint.js b/src/ol/rotationconstraint.js
index ccbd2e5972..daafdbd250 100644
--- a/src/ol/rotationconstraint.js
+++ b/src/ol/rotationconstraint.js
@@ -38,11 +38,11 @@ ol.RotationConstraint.none = function(rotation, delta) {
 ol.RotationConstraint.createSnapToN = function(n) {
   var theta = 2 * Math.PI / n;
   return (
-  /**
-       * @param {number|undefined} rotation Rotation.
-       * @param {number} delta Delta.
-       * @return {number|undefined} Rotation.
-       */
+    /**
+     * @param {number|undefined} rotation Rotation.
+     * @param {number} delta Delta.
+     * @return {number|undefined} Rotation.
+     */
     function(rotation, delta) {
       if (rotation !== undefined) {
         rotation = Math.floor((rotation + delta) / theta + 0.5) * theta;
@@ -61,11 +61,11 @@ ol.RotationConstraint.createSnapToN = function(n) {
 ol.RotationConstraint.createSnapToZero = function(opt_tolerance) {
   var tolerance = opt_tolerance || ol.math.toRadians(5);
   return (
-  /**
-       * @param {number|undefined} rotation Rotation.
-       * @param {number} delta Delta.
-       * @return {number|undefined} Rotation.
-       */
+    /**
+     * @param {number|undefined} rotation Rotation.
+     * @param {number} delta Delta.
+     * @return {number|undefined} Rotation.
+     */
     function(rotation, delta) {
       if (rotation !== undefined) {
         if (Math.abs(rotation + delta) <= tolerance) {
diff --git a/src/ol/source/bingmaps.js b/src/ol/source/bingmaps.js
index 89c100ef80..1829ea5ec3 100644
--- a/src/ol/source/bingmaps.js
+++ b/src/ol/source/bingmaps.js
@@ -154,12 +154,12 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = function(response)
             .replace('{subdomain}', subdomain)
             .replace('{culture}', culture);
         return (
-        /**
-             * @param {ol.TileCoord} tileCoord Tile coordinate.
-             * @param {number} pixelRatio Pixel ratio.
-             * @param {ol.proj.Projection} projection Projection.
-             * @return {string|undefined} Tile URL.
-             */
+          /**
+           * @param {ol.TileCoord} tileCoord Tile coordinate.
+           * @param {number} pixelRatio Pixel ratio.
+           * @param {ol.proj.Projection} projection Projection.
+           * @return {string|undefined} Tile URL.
+           */
           function(tileCoord, pixelRatio, projection) {
             if (!tileCoord) {
               return undefined;
diff --git a/src/ol/source/wmts.js b/src/ol/source/wmts.js
index a4ebe9f0dc..4aedb54dc1 100644
--- a/src/ol/source/wmts.js
+++ b/src/ol/source/wmts.js
@@ -119,12 +119,12 @@ ol.source.WMTS = function(options) {
       });
 
     return (
-    /**
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {number} pixelRatio Pixel ratio.
-         * @param {ol.proj.Projection} projection Projection.
-         * @return {string|undefined} Tile URL.
-         */
+      /**
+       * @param {ol.TileCoord} tileCoord Tile coordinate.
+       * @param {number} pixelRatio Pixel ratio.
+       * @param {ol.proj.Projection} projection Projection.
+       * @return {string|undefined} Tile URL.
+       */
       function(tileCoord, pixelRatio, projection) {
         if (!tileCoord) {
           return undefined;
diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js
index 451fab40cf..3ab48d7e22 100644
--- a/src/ol/tileurlfunction.js
+++ b/src/ol/tileurlfunction.js
@@ -16,12 +16,12 @@ ol.TileUrlFunction.createFromTemplate = function(template, tileGrid) {
   var yRegEx = /\{y\}/g;
   var dashYRegEx = /\{-y\}/g;
   return (
-  /**
-       * @param {ol.TileCoord} tileCoord Tile Coordinate.
-       * @param {number} pixelRatio Pixel ratio.
-       * @param {ol.proj.Projection} projection Projection.
-       * @return {string|undefined} Tile URL.
-       */
+    /**
+     * @param {ol.TileCoord} tileCoord Tile Coordinate.
+     * @param {number} pixelRatio Pixel ratio.
+     * @param {ol.proj.Projection} projection Projection.
+     * @return {string|undefined} Tile URL.
+     */
     function(tileCoord, pixelRatio, projection) {
       if (!tileCoord) {
         return undefined;
@@ -69,12 +69,12 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
     return tileUrlFunctions[0];
   }
   return (
-  /**
-       * @param {ol.TileCoord} tileCoord Tile Coordinate.
-       * @param {number} pixelRatio Pixel ratio.
-       * @param {ol.proj.Projection} projection Projection.
-       * @return {string|undefined} Tile URL.
-       */
+    /**
+     * @param {ol.TileCoord} tileCoord Tile Coordinate.
+     * @param {number} pixelRatio Pixel ratio.
+     * @param {ol.proj.Projection} projection Projection.
+     * @return {string|undefined} Tile URL.
+     */
     function(tileCoord, pixelRatio, projection) {
       if (!tileCoord) {
         return undefined;
diff --git a/src/ol/view.js b/src/ol/view.js
index 1665f72493..dfbd4165ff 100644
--- a/src/ol/view.js
+++ b/src/ol/view.js
@@ -697,10 +697,10 @@ ol.View.prototype.getResolutionForValueFunction = function(opt_power) {
   var minResolution = this.minResolution_;
   var max = Math.log(maxResolution / minResolution) / Math.log(power);
   return (
-  /**
-       * @param {number} value Value.
-       * @return {number} Resolution.
-       */
+    /**
+     * @param {number} value Value.
+     * @return {number} Resolution.
+     */
     function(value) {
       var resolution = maxResolution / Math.pow(power, value * max);
       return resolution;
@@ -731,10 +731,10 @@ ol.View.prototype.getValueForResolutionFunction = function(opt_power) {
   var minResolution = this.minResolution_;
   var max = Math.log(maxResolution / minResolution) / Math.log(power);
   return (
-  /**
-       * @param {number} resolution Resolution.
-       * @return {number} Value.
-       */
+    /**
+     * @param {number} resolution Resolution.
+     * @return {number} Value.
+     */
     function(resolution) {
       var value =
             (Math.log(maxResolution / resolution) / Math.log(power)) / max;
diff --git a/src/ol/xml.js b/src/ol/xml.js
index cf3e5c636a..8172942a8c 100644
--- a/src/ol/xml.js
+++ b/src/ol/xml.js
@@ -125,10 +125,10 @@ ol.xml.parse = function(xml) {
  */
 ol.xml.makeArrayExtender = function(valueReader, opt_this) {
   return (
-  /**
-       * @param {Node} node Node.
-       * @param {Array.<*>} objectStack Object stack.
-       */
+    /**
+     * @param {Node} node Node.
+     * @param {Array.<*>} objectStack Object stack.
+     */
     function(node, objectStack) {
       var value = valueReader.call(opt_this, node, objectStack);
       if (value !== undefined) {
@@ -150,10 +150,10 @@ ol.xml.makeArrayExtender = function(valueReader, opt_this) {
  */
 ol.xml.makeArrayPusher = function(valueReader, opt_this) {
   return (
-  /**
-       * @param {Node} node Node.
-       * @param {Array.<*>} objectStack Object stack.
-       */
+    /**
+     * @param {Node} node Node.
+     * @param {Array.<*>} objectStack Object stack.
+     */
     function(node, objectStack) {
       var value = valueReader.call(opt_this !== undefined ? opt_this : this,
           node, objectStack);
@@ -175,10 +175,10 @@ ol.xml.makeArrayPusher = function(valueReader, opt_this) {
  */
 ol.xml.makeReplacer = function(valueReader, opt_this) {
   return (
-  /**
-       * @param {Node} node Node.
-       * @param {Array.<*>} objectStack Object stack.
-       */
+    /**
+     * @param {Node} node Node.
+     * @param {Array.<*>} objectStack Object stack.
+     */
     function(node, objectStack) {
       var value = valueReader.call(opt_this !== undefined ? opt_this : this,
           node, objectStack);
@@ -200,10 +200,10 @@ ol.xml.makeReplacer = function(valueReader, opt_this) {
  */
 ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) {
   return (
-  /**
-       * @param {Node} node Node.
-       * @param {Array.<*>} objectStack Object stack.
-       */
+    /**
+     * @param {Node} node Node.
+     * @param {Array.<*>} objectStack Object stack.
+     */
     function(node, objectStack) {
       var value = valueReader.call(opt_this !== undefined ? opt_this : this,
           node, objectStack);
@@ -234,10 +234,10 @@ ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this)
  */
 ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) {
   return (
-  /**
-       * @param {Node} node Node.
-       * @param {Array.<*>} objectStack Object stack.
-       */
+    /**
+     * @param {Node} node Node.
+     * @param {Array.<*>} objectStack Object stack.
+     */
     function(node, objectStack) {
       var value = valueReader.call(opt_this !== undefined ? opt_this : this,
           node, objectStack);
@@ -317,12 +317,12 @@ ol.xml.makeArraySerializer = function(nodeWriter, opt_this) {
 ol.xml.makeSimpleNodeFactory = function(opt_nodeName, opt_namespaceURI) {
   var fixedNodeName = opt_nodeName;
   return (
-  /**
-       * @param {*} value Value.
-       * @param {Array.<*>} objectStack Object stack.
-       * @param {string=} opt_nodeName Node name.
-       * @return {Node} Node.
-       */
+    /**
+     * @param {*} value Value.
+     * @param {Array.<*>} objectStack Object stack.
+     * @param {string=} opt_nodeName Node name.
+     * @return {Node} Node.
+     */
     function(value, objectStack, opt_nodeName) {
       var context = objectStack[objectStack.length - 1];
       var node = context.node;