diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js index 1478c98596..19ee6b16e4 100644 --- a/lib/OpenLayers.js +++ b/lib/OpenLayers.js @@ -109,6 +109,7 @@ "OpenLayers/Layer/Boxes.js", "OpenLayers/Layer/TMS.js", "OpenLayers/Layer/TileCache.js", + "OpenLayers/Layer/DigitalGlobe.js", "OpenLayers/Popup/Anchored.js", "OpenLayers/Popup/AnchoredBubble.js", "OpenLayers/Feature.js", @@ -196,7 +197,9 @@ h.appendChild(s); } } - if (allScriptTags) document.write(allScriptTags); + if (allScriptTags) { + document.write(allScriptTags); + } } })(); diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js index 32d359cc0f..da2fde9967 100644 --- a/lib/OpenLayers/Ajax.js +++ b/lib/OpenLayers/Ajax.js @@ -135,9 +135,9 @@ OpenLayers.Ajax = { */ getTransport: function() { return OpenLayers.Util.Try( - function() {return new ActiveXObject('Msxml2.XMLHTTP')}, - function() {return new ActiveXObject('Microsoft.XMLHTTP')}, - function() {return new XMLHttpRequest()} + function() {return new ActiveXObject('Msxml2.XMLHTTP');}, + function() {return new ActiveXObject('Microsoft.XMLHTTP');}, + function() {return new XMLHttpRequest();} ) || false; }, @@ -167,9 +167,11 @@ OpenLayers.Ajax.Responders = { * responderToAdd - {?} */ register: function(responderToAdd) { - for (var i = 0; i < this.responders.length; i++) - if (responderToAdd == this.responders[i]) + for (var i = 0; i < this.responders.length; i++){ + if (responderToAdd == this.responders[i]){ return; + } + } this.responders.push(responderToAdd); }, @@ -289,8 +291,9 @@ OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, { */ request: function(url) { var parameters = this.options.parameters || ''; - if (parameters.length > 0) parameters += '&_='; - + if (parameters.length > 0) { + parameters += '&_='; + } try { this.url = url; if (this.options.method == 'get' && parameters.length > 0) { @@ -307,7 +310,7 @@ OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, { if (this.options.asynchronous) { setTimeout(OpenLayers.Function.bind( - (function() {this.respondToReadyState(1)}),this), 10 + (function() {this.respondToReadyState(1);}),this), 10 ); } @@ -525,4 +528,4 @@ OpenLayers.Ajax.serializeXMLToString = function(xmldom) { var serializer = new XMLSerializer(); data = serializer.serializeToString(xmldom); return data; -} +}; diff --git a/lib/OpenLayers/BaseTypes/Class.js b/lib/OpenLayers/BaseTypes/Class.js index 0a98f6420a..8fbc992aa1 100644 --- a/lib/OpenLayers/BaseTypes/Class.js +++ b/lib/OpenLayers/BaseTypes/Class.js @@ -31,7 +31,7 @@ OpenLayers.Class = function() { if (arguments && arguments[0] != OpenLayers.Class.isPrototype) { this.initialize.apply(this, arguments); } - } + }; var extended = {}; var parent; for(var i=0; i} */ defaultMouseUp: function (evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } if (this.zoomBox) { this.zoomBoxEnd(evt); } else { diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js index c3e229fd4d..a355fe84ee 100644 --- a/lib/OpenLayers/Control/MouseToolbar.js +++ b/lib/OpenLayers/Control/MouseToolbar.js @@ -123,7 +123,9 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( * evt - {Event} */ buttonDown: function(evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } this.buttonClicked = evt.element.action; OpenLayers.Event.stop(evt); }, @@ -135,7 +137,9 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( * evt - {Event} */ buttonUp: function(evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } if (this.buttonClicked != null) { if (this.buttonClicked == evt.element.action) { this.switchModeTo(evt.element.action); @@ -167,7 +171,9 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( * evt - {Event} */ defaultMouseDown: function (evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } this.mouseDragStart = evt.xy.clone(); this.performedDrag = false; this.startViaKeyboard = false; @@ -242,7 +248,7 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( this.map.div.style.cursor = "move"; break; } - document.onselectstart = function() { return false; } + document.onselectstart = function() { return false; }; OpenLayers.Event.stop(evt); }, @@ -333,11 +339,15 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( * evt - {Event} */ defaultMouseUp: function (evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } switch (this.mode) { case "zoombox": this.zoomBoxEnd(evt); - if (this.startViaKeyboard) this.leaveMode(); + if (this.startViaKeyboard) { + this.leaveMode(); + } break; case "pan": if (this.performedDrag) { @@ -360,7 +370,9 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( && OpenLayers.Util.mouseLeft(evt, this.map.div)) { if (this.zoomBox) { this.removeZoomBox(); - if (this.startViaKeyboard) this.leaveMode(); + if (this.startViaKeyboard) { + this.leaveMode(); + } } this.mouseDragStart = null; this.map.div.style.cursor = "default"; diff --git a/lib/OpenLayers/Control/Navigation.js b/lib/OpenLayers/Control/Navigation.js index a16d3fb5b4..72f0df1d40 100644 --- a/lib/OpenLayers/Control/Navigation.js +++ b/lib/OpenLayers/Control/Navigation.js @@ -108,8 +108,9 @@ OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, { */ wheelChange: function(evt, deltaZ) { var newZoom = this.map.getZoom() + deltaZ; - if (!this.map.isValidZoomLevel(newZoom)) return; - + if (!this.map.isValidZoomLevel(newZoom)) { + return; + } var size = this.map.getSize(); var deltaX = size.w/2 - evt.xy.x; var deltaY = evt.xy.y - size.h/2; diff --git a/lib/OpenLayers/Control/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js index cc2ba5abac..553e16d6b2 100644 --- a/lib/OpenLayers/Control/OverviewMap.js +++ b/lib/OpenLayers/Control/OverviewMap.js @@ -308,7 +308,9 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, { * evt - {} evt */ rectMouseDown: function (evt) { - if(!OpenLayers.Event.isLeftClick(evt)) return; + if(!OpenLayers.Event.isLeftClick(evt)) { + return; + } this.rectDragStart = evt.xy.clone(); this.performedRectDrag = false; OpenLayers.Event.stop(evt); @@ -355,7 +357,9 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, { * evt - {} evt */ rectMouseUp: function(evt) { - if(!OpenLayers.Event.isLeftClick(evt)) return; + if(!OpenLayers.Event.isLeftClick(evt)) { + return; + } if(this.performedRectDrag) { this.updateMapToRect(); OpenLayers.Event.stop(evt); diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js index 8a96463bcd..fd124d7495 100644 --- a/lib/OpenLayers/Control/PanZoom.js +++ b/lib/OpenLayers/Control/PanZoom.js @@ -151,7 +151,9 @@ OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, { * evt - {Event} */ buttonDown: function (evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } switch (this.action) { case "panup": diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js index 20db52f866..f5f4b14455 100644 --- a/lib/OpenLayers/Control/PanZoomBar.js +++ b/lib/OpenLayers/Control/PanZoomBar.js @@ -72,7 +72,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { this.divEvents = null; this.map.events.unregister("zoomend", this, this.moveZoomBar); - this.map.events.unregister("changebaselayer", this, this.redraw) + this.map.events.unregister("changebaselayer", this, this.redraw); OpenLayers.Control.PanZoom.prototype.destroy.apply(this, arguments); }, @@ -155,7 +155,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { sz = new OpenLayers.Size(); sz.h = this.zoomStopHeight * this.map.getNumZoomLevels(); sz.w = this.zoomStopWidth; - var div = null + var div = null; if (OpenLayers.Util.alphaHack()) { var id = "OpenLayers_Control_PanZoomBar" + this.map.id; @@ -211,7 +211,9 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { * and sets the zoom level appropriately. */ divClick: function (evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } var y = evt.xy.y; var top = OpenLayers.Util.pagePosition(evt.object)[1]; var levels = Math.floor((y - top)/this.zoomStopHeight); @@ -227,7 +229,9 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { * evt - {} */ zoomBarDown:function(evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } this.map.events.register("mousemove", this, this.passEventToSlider); this.map.events.register("mouseup", this, this.passEventToSlider); this.mouseDragStart = evt.xy.clone(); @@ -250,7 +254,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { */ zoomBarDrag:function(evt) { if (this.mouseDragStart != null) { - var deltaY = this.mouseDragStart.y - evt.xy.y + var deltaY = this.mouseDragStart.y - evt.xy.y; var offsets = OpenLayers.Util.pagePosition(this.zoombarDiv); if ((evt.clientY - offsets[1]) > 0 && (evt.clientY - offsets[1]) < parseInt(this.zoombarDiv.style.height) - 2) { @@ -271,12 +275,14 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, { * evt - {} */ zoomBarUp:function(evt) { - if (!OpenLayers.Event.isLeftClick(evt)) return; + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } if (this.zoomStart) { this.div.style.cursor=""; this.map.events.unregister("mouseup", this, this.passEventToSlider); this.map.events.unregister("mousemove", this, this.passEventToSlider); - var deltaY = this.zoomStart.y - evt.xy.y + var deltaY = this.zoomStart.y - evt.xy.y; this.map.zoomTo(this.map.zoom + Math.round(deltaY/this.zoomStopHeight)); this.moveZoomBar(); this.mouseDragStart = null; diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js index e55a79dfe4..9afb34ecf9 100644 --- a/lib/OpenLayers/Control/Scale.js +++ b/lib/OpenLayers/Control/Scale.js @@ -55,7 +55,9 @@ OpenLayers.Control.Scale = OpenLayers.Class(OpenLayers.Control, { */ updateScale: function() { var scale = this.map.getScale(); - if (!scale) return; + if (!scale) { + return; + } if (scale >= 9500 && scale <= 950000) { scale = Math.round(scale / 1000) + "K"; diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js index d0e4bbfed3..ee33c933ea 100644 --- a/lib/OpenLayers/Events.js +++ b/lib/OpenLayers/Events.js @@ -145,8 +145,9 @@ OpenLayers.Event = { findElement: function(event, tagName) { var element = OpenLayers.Event.element(event); while (element.parentNode && (!element.tagName || - (element.tagName.toUpperCase() != tagName.toUpperCase()))) + (element.tagName.toUpperCase() != tagName.toUpperCase()))){ element = element.parentNode; + } return element; }, @@ -637,7 +638,7 @@ OpenLayers.Events = OpenLayers.Class({ */ handleBrowserEvent: function (evt) { evt.xy = this.getMousePosition(evt); - this.triggerEvent(evt.type, evt) + this.triggerEvent(evt.type, evt); }, /** diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js index 49309b4f47..8360457fea 100644 --- a/lib/OpenLayers/Feature/Vector.js +++ b/lib/OpenLayers/Feature/Vector.js @@ -9,7 +9,7 @@ OpenLayers.State = { INSERT: 'Insert', UPDATE: 'Update', DELETE: 'Delete' -} +}; /** * @requires OpenLayers/Feature.js diff --git a/lib/OpenLayers/Feature/WFS.js b/lib/OpenLayers/Feature/WFS.js index 6c8142f48f..05a1333c27 100644 --- a/lib/OpenLayers/Feature/WFS.js +++ b/lib/OpenLayers/Feature/WFS.js @@ -27,7 +27,7 @@ OpenLayers.Feature.WFS = OpenLayers.Class(OpenLayers.Feature, { initialize: function(layer, xmlNode) { var newArguments = arguments; var data = this.processXMLNode(xmlNode); - newArguments = new Array(layer, data.lonlat, data) + newArguments = new Array(layer, data.lonlat, data); OpenLayers.Feature.prototype.initialize.apply(this, newArguments); this.createMarker(); this.layer.addMarker(this.marker); diff --git a/lib/OpenLayers/Format/GeoJSON.js b/lib/OpenLayers/Format/GeoJSON.js index af72b6a611..ca1c48b0fe 100644 --- a/lib/OpenLayers/Format/GeoJSON.js +++ b/lib/OpenLayers/Format/GeoJSON.js @@ -174,7 +174,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, { case "FeatureCollection": // allow for any type to be converted to a feature collection valid = true; - break + break; default: // for GeometryCollection and Feature, types must match if(obj.type == type) { @@ -489,7 +489,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, { */ createCRSObject: function(object) { var proj = object.layer.projection; - var crs = {} + var crs = {}; if (proj.match(/epsg:/i)) { var code = parseInt(proj.substring(proj.indexOf(":") + 1)); if (code == 4326) { @@ -534,7 +534,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, { "id": feature.fid == null ? feature.id : feature.fid, "properties": feature.attributes, "geometry": geom - } + }; }, /** @@ -553,7 +553,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, { return { "type": geometryType, "coordinates": data - } + }; }, /** diff --git a/lib/OpenLayers/Format/WKT.js b/lib/OpenLayers/Format/WKT.js index 267e30412d..c1f4061a69 100644 --- a/lib/OpenLayers/Format/WKT.js +++ b/lib/OpenLayers/Format/WKT.js @@ -281,7 +281,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, { for(var i=0; i'; + if (link) { + contentHTML += ''; + } contentHTML += title; - if (link) contentHTML += ''; + if (link) { + contentHTML += ''; + } contentHTML += ''; contentHTML += '
'; contentHTML += description; diff --git a/lib/OpenLayers/Layer/Google.js b/lib/OpenLayers/Layer/Google.js index 02ea177b45..9d247cb401 100644 --- a/lib/OpenLayers/Layer/Google.js +++ b/lib/OpenLayers/Layer/Google.js @@ -296,7 +296,7 @@ OpenLayers.Layer.Google = OpenLayers.Class( var html = ""; html += "The Google Layer was unable to load correctly.
"; html += "
"; - html += "To get rid of this message, select a new BaseLayer " + html += "To get rid of this message, select a new BaseLayer "; html += "in the layer switcher in the upper-right corner.
"; html += "
"; html += "Most likely, this is because the Google Maps library"; @@ -304,7 +304,7 @@ OpenLayers.Layer.Google = OpenLayers.Class( html += " correct API key for your site.
"; html += "
"; html += "Developers: For help getting this working correctly, "; - html += "= 5.5) && (version < 7) ); -} +}; /** * Function: modifyAlphaImageDiv @@ -587,7 +589,7 @@ OpenLayers.Util.Try = function() { } return returnValue; -} +}; /** @@ -681,10 +683,12 @@ OpenLayers.Util.getXmlNodeValue = function(node) { OpenLayers.Util.Try( function() { val = node.text; - if (!val) + if (!val) { val = node.textContent; - if (!val) + } + if (!val) { val = node.firstChild.nodeValue; + } }, function() { val = node.textContent; @@ -747,7 +751,9 @@ OpenLayers.Util.distVincenty=function(p1, p2) { var sinLambda = Math.sin(lambda), cosLambda = Math.cos(lambda); var sinSigma = Math.sqrt((cosU2*sinLambda) * (cosU2*sinLambda) + (cosU1*sinU2-sinU1*cosU2*cosLambda) * (cosU1*sinU2-sinU1*cosU2*cosLambda)); - if (sinSigma==0) return 0; // co-incident points + if (sinSigma==0) { + return 0; // co-incident points + } var cosSigma = sinU1*sinU2 + cosU1*cosU2*cosLambda; var sigma = Math.atan2(sinSigma, cosSigma); var alpha = Math.asin(cosU1 * cosU2 * sinLambda / sinSigma); @@ -758,7 +764,9 @@ OpenLayers.Util.distVincenty=function(p1, p2) { lambda = L + (1-C) * f * Math.sin(alpha) * (sigma + C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM))); } - if (iterLimit==0) return NaN // formula failed to converge + if (iterLimit==0) { + return NaN; // formula failed to converge + } var uSq = cosSqAlpha * (a*a - b*b) / (b*b); var A = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq))); var B = uSq/1024 * (256+uSq*(-128+uSq*(74-47*uSq))); @@ -783,9 +791,9 @@ OpenLayers.Util.distVincenty=function(p1, p2) { * {Object} An object of key/value pairs from the query string. */ OpenLayers.Util.getParameters = function(url) { - //if no url specified, take it from the location bar - url = url || window.location.href - if(url == null) { + /* if no url specified, take it from the location bar */ + url = url || window.location.href; + if (url == null) { url = window.location.href; } @@ -980,7 +988,7 @@ OpenLayers.Util.safeStopPropagation = function(evt) { * Parameters: * forElement - {DOMElement} * - * Returns:´ + * Returns:´ * {Array} two item array, L value then T value. */ OpenLayers.Util.pagePosition = function(forElement) { @@ -1184,7 +1192,7 @@ OpenLayers.Util.createUrlObject = function(url, options) { var index = relStr.indexOf("../"); if (index == 0) { - backs++ + backs++; relStr = relStr.substr(3); } else if (index >= 0) { var prevChunk = relStr.substr(0,index - 1); diff --git a/tests/throws.js b/tests/throws.js index d6b8897bed..c32035524d 100644 --- a/tests/throws.js +++ b/tests/throws.js @@ -79,5 +79,4 @@ function (fn, expectedException, doc) { } else { this.fail(doc); } -} - +}; \ No newline at end of file