Merge pull request #4788 from fredj/cleanup

Remove unnecessary newlines

src/ol/control/rotatecontrol.js

@@ -26,8 +26,7 @@ ol.control.Rotate = function(opt_options) {
 
   var options = opt_options ? opt_options : {};
 
-  var className = options.className ?
+  var className = options.className ? options.className : 'ol-rotate';
-      options.className : 'ol-rotate';
 
   var label = options.label ? options.label : '\u21E7';
 

src/ol/control/scalelinecontrol.js

@@ -61,8 +61,7 @@ ol.control.ScaleLine = function(opt_options) {
    * @private
    * @type {Element}
    */
-  this.innerElement_ = goog.dom.createDom('DIV',
+  this.innerElement_ = goog.dom.createDom('DIV', className + '-inner');
-      className + '-inner');
 
   /**
    * @private

src/ol/control/zoomcontrol.js

@@ -58,8 +58,7 @@ ol.control.Zoom = function(opt_options) {
 
   var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' +
       ol.css.CLASS_CONTROL;
-  var element = goog.dom.createDom('DIV', cssClasses, inElement,
+  var element = goog.dom.createDom('DIV', cssClasses, inElement, outElement);
-      outElement);
 
   goog.base(this, {
     element: element,

src/ol/control/zoomtoextentcontrol.js

@@ -69,8 +69,7 @@ ol.control.ZoomToExtent.prototype.handleClick_ = function(event) {
 ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function() {
   var map = this.getMap();
   var view = map.getView();
-  var extent = !this.extent_ ?
+  var extent = !this.extent_ ? view.getProjection().getExtent() : this.extent_;
-      view.getProjection().getExtent() : this.extent_;
   var size = map.getSize();
   goog.asserts.assert(size, 'size should be defined');
   view.fit(extent, size);

src/ol/events.js

@@ -266,8 +266,7 @@ ol.events.listen = function(target, type, listener, opt_this, opt_once) {
  *     listener. Default is the `target`.
  * @return {ol.events.Key} Key for unlistenByKey.
  */
-ol.events.listenOnce = function(
+ol.events.listenOnce = function(target, type, listener, opt_this) {
-    target, type, listener, opt_this) {
   return ol.events.listen(target, type, listener, opt_this, true);
 };
 

src/ol/map.js

@@ -1308,8 +1308,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
   var view = this.getView();
   /** @type {?olx.FrameState} */
   var frameState = null;
-  if (size !== undefined && ol.size.hasArea(size) &&
+  if (size !== undefined && ol.size.hasArea(size) && view && view.isDef()) {
-      view && view.isDef()) {
     var viewHints = view.getHints();
     var layerStatesArray = this.getLayerGroup().getLayerStatesArray();
     var layerStates = {};