From 56d4c1490bd277d3f122a007c576eef779e12328 Mon Sep 17 00:00:00 2001 From: euzuro Date: Fri, 19 Sep 2008 16:44:44 +0000 Subject: [PATCH] Bringing up patches from trunk to branch for RC3. -r8012:HEAD. (Closes #1594) (Closes #1730) (Closes #1735) (Closes #1738) (Closes #1740) git-svn-id: http://svn.openlayers.org/branches/openlayers/2.7@8038 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- apidoc_config/Menu.txt | 90 +++++++++++++++++++---- doc_config/Menu.txt | 90 +++++++++++++++++++---- lib/OpenLayers/BaseTypes.js | 6 +- lib/OpenLayers/Console.js | 8 +- lib/OpenLayers/Control/Attribution.js | 3 + lib/OpenLayers/Control/EditingToolbar.js | 3 + lib/OpenLayers/Control/MousePosition.js | 3 + lib/OpenLayers/Control/Navigation.js | 2 +- lib/OpenLayers/Control/Pan.js | 7 ++ lib/OpenLayers/Control/PanPanel.js | 4 +- lib/OpenLayers/Control/Scale.js | 1 + lib/OpenLayers/Control/ZoomIn.js | 7 ++ lib/OpenLayers/Control/ZoomOut.js | 9 ++- lib/OpenLayers/Control/ZoomPanel.js | 6 ++ lib/OpenLayers/Control/ZoomToMaxExtent.js | 2 +- lib/OpenLayers/Format/GML/Base.js | 10 +-- lib/OpenLayers/Format/WFS.js | 3 + lib/OpenLayers/Protocol.js | 4 +- lib/OpenLayers/Protocol/HTTP.js | 10 +-- lib/OpenLayers/Renderer/SVG.js | 2 +- lib/OpenLayers/Strategy.js | 5 +- tests/Control/Navigation.html | 4 +- tests/Renderer/SVG.html | 23 ++++-- 23 files changed, 236 insertions(+), 66 deletions(-) diff --git a/apidoc_config/Menu.txt b/apidoc_config/Menu.txt index 2fdc653484..f503202619 100644 --- a/apidoc_config/Menu.txt +++ b/apidoc_config/Menu.txt @@ -45,10 +45,9 @@ SubTitle: JavaScript Mapping Library # -------------------------------------------------------------------------- -File: OpenLayers (OpenLayers.js) - Group: OpenLayers { + File: OpenLayers (no auto-title, OpenLayers.js) File: Ajax (no auto-title, OpenLayers/Ajax.js) Group: BaseTypes { @@ -76,6 +75,7 @@ Group: OpenLayers { File: EditingToolbar (no auto-title, OpenLayers/Control/EditingToolbar.js) File: KeyboardDefaults (no auto-title, OpenLayers/Control/KeyboardDefaults.js) File: LayerSwitcher (no auto-title, OpenLayers/Control/LayerSwitcher.js) + File: Measure (no auto-title, OpenLayers/Control/Measure.js) File: ModifyFeature (no auto-title, OpenLayers/Control/ModifyFeature.js) File: MouseDefaults (no auto-title, OpenLayers/Control/MouseDefaults.js) File: MousePosition (no auto-title, OpenLayers/Control/MousePosition.js) @@ -84,7 +84,9 @@ Group: OpenLayers { File: NavigationHistory (no auto-title, OpenLayers/Control/NavigationHistory.js) File: NavToolbar (no auto-title, OpenLayers/Control/NavToolbar.js) File: OverviewMap (no auto-title, OpenLayers/Control/OverviewMap.js) + File: Pan (no auto-title, OpenLayers/Control/Pan.js) File: Panel (no auto-title, OpenLayers/Control/Panel.js) + File: PanPanel (no auto-title, OpenLayers/Control/PanPanel.js) File: PanZoom (no auto-title, OpenLayers/Control/PanZoom.js) File: PanZoomBar (no auto-title, OpenLayers/Control/PanZoomBar.js) File: Permalink (no auto-title, OpenLayers/Control/Permalink.js) @@ -92,6 +94,9 @@ Group: OpenLayers { File: ScaleLine (no auto-title, OpenLayers/Control/ScaleLine.js) File: SelectFeature (no auto-title, OpenLayers/Control/SelectFeature.js) File: ZoomBox (no auto-title, OpenLayers/Control/ZoomBox.js) + File: ZoomIn (no auto-title, OpenLayers/Control/ZoomIn.js) + File: ZoomOut (no auto-title, OpenLayers/Control/ZoomOut.js) + File: ZoomPanel (no auto-title, OpenLayers/Control/ZoomPanel.js) File: ZoomToMaxExtent (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js) } # Group: Control @@ -110,17 +115,39 @@ Group: OpenLayers { File: Comparison (no auto-title, OpenLayers/Filter/Comparison.js) File: FeatureId (no auto-title, OpenLayers/Filter/FeatureId.js) File: Logical (no auto-title, OpenLayers/Filter/Logical.js) + File: Spatial (no auto-title, OpenLayers/Filter/Spatial.js) } # Group: Filter Group: Format { File: Format (no auto-title, OpenLayers/Format.js) + + Group: Filter { + + File: Filter (no auto-title, OpenLayers/Format/Filter.js) + File: v1 (no auto-title, OpenLayers/Format/Filter/v1.js) + File: v1_0_0 (no auto-title, OpenLayers/Format/Filter/v1_0_0.js) + } # Group: Filter + File: GeoJSON (no auto-title, OpenLayers/Format/GeoJSON.js) File: GeoRSS (no auto-title, OpenLayers/Format/GeoRSS.js) - File: GML (no auto-title, OpenLayers/Format/GML.js) + + Group: GML { + + File: GML (no auto-title, OpenLayers/Format/GML.js) + File: Base (no auto-title, OpenLayers/Format/GML/Base.js) + File: v2 (no auto-title, OpenLayers/Format/GML/v2.js) + File: v3 (no auto-title, OpenLayers/Format/GML/v3.js) + } # Group: GML + + File: GPX (no auto-title, OpenLayers/Format/GPX.js) File: JSON (no auto-title, OpenLayers/Format/JSON.js) File: KML (no auto-title, OpenLayers/Format/KML.js) File: OSM (no auto-title, OpenLayers/Format/OSM.js) + File: Text (no auto-title, OpenLayers/Format/Text.js) + File: WFS (no auto-title, OpenLayers/Format/WFS.js) + File: WKT (no auto-title, OpenLayers/Format/WKT.js) + File: XML (no auto-title, OpenLayers/Format/XML.js) Group: SLD { @@ -129,11 +156,6 @@ Group: OpenLayers { File: v1_0_0 (no auto-title, OpenLayers/Format/SLD/v1_0_0.js) } # Group: SLD - File: Text (no auto-title, OpenLayers/Format/Text.js) - File: WFS (no auto-title, OpenLayers/Format/WFS.js) - File: WKT (no auto-title, OpenLayers/Format/WKT.js) - File: XML (no auto-title, OpenLayers/Format/XML.js) - Group: WMC { File: WMC (no auto-title, OpenLayers/Format/WMC.js) @@ -180,11 +202,18 @@ Group: OpenLayers { Group: Lang { File: Lang (no auto-title, OpenLayers/Lang.js) - File: Lang["cs-CZ"] (OpenLayers/Lang/cs-CZ.js) - File: Lang["de"] (no auto-title, OpenLayers/Lang/de.js) - File: Lang["en"] (no auto-title, OpenLayers/Lang/en.js) - File: Lang["en-CA"] (no auto-title, OpenLayers/Lang/en-CA.js) - File: Lang["fr"] (no auto-title, OpenLayers/Lang/fr.js) + File: cs-CZ (no auto-title, OpenLayers/Lang/cs-CZ.js) + File: de (no auto-title, OpenLayers/Lang/de.js) + File: en (no auto-title, OpenLayers/Lang/en.js) + File: en-CA (no auto-title, OpenLayers/Lang/en-CA.js) + File: fr (no auto-title, OpenLayers/Lang/fr.js) + File: it (no auto-title, OpenLayers/Lang/it.js) + File: nb (no auto-title, OpenLayers/Lang/nb.js) + File: nl (no auto-title, OpenLayers/Lang/nl.js) + File: pt-BR (no auto-title, OpenLayers/Lang/pt-BR.js) + File: sv-SE (no auto-title, OpenLayers/Lang/sv-SE.js) + File: zh-CN (no auto-title, OpenLayers/Lang/zh-CN.js) + File: zh-TW (no auto-title, OpenLayers/Lang/zh-TW.js) } # Group: Lang Group: Layer { @@ -200,6 +229,7 @@ Group: OpenLayers { File: HTTPRequest (no auto-title, OpenLayers/Layer/HTTPRequest.js) File: Image (no auto-title, OpenLayers/Layer/Image.js) File: KaMap (no auto-title, OpenLayers/Layer/KaMap.js) + File: KaMapCache (no auto-title, OpenLayers/Layer/KaMapCache.js) File: MapGuide (no auto-title, OpenLayers/Layer/MapGuide.js) File: MapServer (no auto-title, OpenLayers/Layer/MapServer.js) File: MapServer.Untiled (no auto-title, OpenLayers/Layer/MapServer/Untiled.js) @@ -232,21 +262,51 @@ Group: OpenLayers { File: Popup (no auto-title, OpenLayers/Popup.js) File: Anchored (no auto-title, OpenLayers/Popup/Anchored.js) File: AnchoredBubble (no auto-title, OpenLayers/Popup/AnchoredBubble.js) - File: Framed (OpenLayers/Popup/Framed.js) - File: FramedCloud (OpenLayers/Popup/FramedCloud.js) + File: Framed (no auto-title, OpenLayers/Popup/Framed.js) + File: FramedCloud (no auto-title, OpenLayers/Popup/FramedCloud.js) } # Group: Popup File: Projection (no auto-title, OpenLayers/Projection.js) + Group: Protocol { + + File: Protocol (no auto-title, OpenLayers/Protocol.js) + File: HTTP (no auto-title, OpenLayers/Protocol/HTTP.js) + + Group: SQL { + + File: SQL (no auto-title, OpenLayers/Protocol/SQL.js) + File: Gears (no auto-title, OpenLayers/Protocol/SQL/Gears.js) + } # Group: SQL + + } # Group: Protocol + Group: Renderer { File: Renderer (no auto-title, OpenLayers/Renderer.js) + File: Canvas (no auto-title, OpenLayers/Renderer/Canvas.js) File: Elements (no auto-title, OpenLayers/Renderer/Elements.js) File: SVG (no auto-title, OpenLayers/Renderer/SVG.js) File: VML (no auto-title, OpenLayers/Renderer/VML.js) } # Group: Renderer + Group: Request { + + File: Request (no auto-title, OpenLayers/Request.js) + File: XMLHttpRequest (no auto-title, OpenLayers/Request/XMLHttpRequest.js) + } # Group: Request + File: Rule (no auto-title, OpenLayers/Rule.js) + + Group: Strategy { + + File: Strategy (no auto-title, OpenLayers/Strategy.js) + File: BBOX (no auto-title, OpenLayers/Strategy/BBOX.js) + File: Cluster (no auto-title, OpenLayers/Strategy/Cluster.js) + File: Fixed (no auto-title, OpenLayers/Strategy/Fixed.js) + File: Paging (no auto-title, OpenLayers/Strategy/Paging.js) + } # Group: Strategy + File: Style (no auto-title, OpenLayers/Style.js) File: StyleMap (no auto-title, OpenLayers/StyleMap.js) diff --git a/doc_config/Menu.txt b/doc_config/Menu.txt index 2fdc653484..f503202619 100644 --- a/doc_config/Menu.txt +++ b/doc_config/Menu.txt @@ -45,10 +45,9 @@ SubTitle: JavaScript Mapping Library # -------------------------------------------------------------------------- -File: OpenLayers (OpenLayers.js) - Group: OpenLayers { + File: OpenLayers (no auto-title, OpenLayers.js) File: Ajax (no auto-title, OpenLayers/Ajax.js) Group: BaseTypes { @@ -76,6 +75,7 @@ Group: OpenLayers { File: EditingToolbar (no auto-title, OpenLayers/Control/EditingToolbar.js) File: KeyboardDefaults (no auto-title, OpenLayers/Control/KeyboardDefaults.js) File: LayerSwitcher (no auto-title, OpenLayers/Control/LayerSwitcher.js) + File: Measure (no auto-title, OpenLayers/Control/Measure.js) File: ModifyFeature (no auto-title, OpenLayers/Control/ModifyFeature.js) File: MouseDefaults (no auto-title, OpenLayers/Control/MouseDefaults.js) File: MousePosition (no auto-title, OpenLayers/Control/MousePosition.js) @@ -84,7 +84,9 @@ Group: OpenLayers { File: NavigationHistory (no auto-title, OpenLayers/Control/NavigationHistory.js) File: NavToolbar (no auto-title, OpenLayers/Control/NavToolbar.js) File: OverviewMap (no auto-title, OpenLayers/Control/OverviewMap.js) + File: Pan (no auto-title, OpenLayers/Control/Pan.js) File: Panel (no auto-title, OpenLayers/Control/Panel.js) + File: PanPanel (no auto-title, OpenLayers/Control/PanPanel.js) File: PanZoom (no auto-title, OpenLayers/Control/PanZoom.js) File: PanZoomBar (no auto-title, OpenLayers/Control/PanZoomBar.js) File: Permalink (no auto-title, OpenLayers/Control/Permalink.js) @@ -92,6 +94,9 @@ Group: OpenLayers { File: ScaleLine (no auto-title, OpenLayers/Control/ScaleLine.js) File: SelectFeature (no auto-title, OpenLayers/Control/SelectFeature.js) File: ZoomBox (no auto-title, OpenLayers/Control/ZoomBox.js) + File: ZoomIn (no auto-title, OpenLayers/Control/ZoomIn.js) + File: ZoomOut (no auto-title, OpenLayers/Control/ZoomOut.js) + File: ZoomPanel (no auto-title, OpenLayers/Control/ZoomPanel.js) File: ZoomToMaxExtent (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js) } # Group: Control @@ -110,17 +115,39 @@ Group: OpenLayers { File: Comparison (no auto-title, OpenLayers/Filter/Comparison.js) File: FeatureId (no auto-title, OpenLayers/Filter/FeatureId.js) File: Logical (no auto-title, OpenLayers/Filter/Logical.js) + File: Spatial (no auto-title, OpenLayers/Filter/Spatial.js) } # Group: Filter Group: Format { File: Format (no auto-title, OpenLayers/Format.js) + + Group: Filter { + + File: Filter (no auto-title, OpenLayers/Format/Filter.js) + File: v1 (no auto-title, OpenLayers/Format/Filter/v1.js) + File: v1_0_0 (no auto-title, OpenLayers/Format/Filter/v1_0_0.js) + } # Group: Filter + File: GeoJSON (no auto-title, OpenLayers/Format/GeoJSON.js) File: GeoRSS (no auto-title, OpenLayers/Format/GeoRSS.js) - File: GML (no auto-title, OpenLayers/Format/GML.js) + + Group: GML { + + File: GML (no auto-title, OpenLayers/Format/GML.js) + File: Base (no auto-title, OpenLayers/Format/GML/Base.js) + File: v2 (no auto-title, OpenLayers/Format/GML/v2.js) + File: v3 (no auto-title, OpenLayers/Format/GML/v3.js) + } # Group: GML + + File: GPX (no auto-title, OpenLayers/Format/GPX.js) File: JSON (no auto-title, OpenLayers/Format/JSON.js) File: KML (no auto-title, OpenLayers/Format/KML.js) File: OSM (no auto-title, OpenLayers/Format/OSM.js) + File: Text (no auto-title, OpenLayers/Format/Text.js) + File: WFS (no auto-title, OpenLayers/Format/WFS.js) + File: WKT (no auto-title, OpenLayers/Format/WKT.js) + File: XML (no auto-title, OpenLayers/Format/XML.js) Group: SLD { @@ -129,11 +156,6 @@ Group: OpenLayers { File: v1_0_0 (no auto-title, OpenLayers/Format/SLD/v1_0_0.js) } # Group: SLD - File: Text (no auto-title, OpenLayers/Format/Text.js) - File: WFS (no auto-title, OpenLayers/Format/WFS.js) - File: WKT (no auto-title, OpenLayers/Format/WKT.js) - File: XML (no auto-title, OpenLayers/Format/XML.js) - Group: WMC { File: WMC (no auto-title, OpenLayers/Format/WMC.js) @@ -180,11 +202,18 @@ Group: OpenLayers { Group: Lang { File: Lang (no auto-title, OpenLayers/Lang.js) - File: Lang["cs-CZ"] (OpenLayers/Lang/cs-CZ.js) - File: Lang["de"] (no auto-title, OpenLayers/Lang/de.js) - File: Lang["en"] (no auto-title, OpenLayers/Lang/en.js) - File: Lang["en-CA"] (no auto-title, OpenLayers/Lang/en-CA.js) - File: Lang["fr"] (no auto-title, OpenLayers/Lang/fr.js) + File: cs-CZ (no auto-title, OpenLayers/Lang/cs-CZ.js) + File: de (no auto-title, OpenLayers/Lang/de.js) + File: en (no auto-title, OpenLayers/Lang/en.js) + File: en-CA (no auto-title, OpenLayers/Lang/en-CA.js) + File: fr (no auto-title, OpenLayers/Lang/fr.js) + File: it (no auto-title, OpenLayers/Lang/it.js) + File: nb (no auto-title, OpenLayers/Lang/nb.js) + File: nl (no auto-title, OpenLayers/Lang/nl.js) + File: pt-BR (no auto-title, OpenLayers/Lang/pt-BR.js) + File: sv-SE (no auto-title, OpenLayers/Lang/sv-SE.js) + File: zh-CN (no auto-title, OpenLayers/Lang/zh-CN.js) + File: zh-TW (no auto-title, OpenLayers/Lang/zh-TW.js) } # Group: Lang Group: Layer { @@ -200,6 +229,7 @@ Group: OpenLayers { File: HTTPRequest (no auto-title, OpenLayers/Layer/HTTPRequest.js) File: Image (no auto-title, OpenLayers/Layer/Image.js) File: KaMap (no auto-title, OpenLayers/Layer/KaMap.js) + File: KaMapCache (no auto-title, OpenLayers/Layer/KaMapCache.js) File: MapGuide (no auto-title, OpenLayers/Layer/MapGuide.js) File: MapServer (no auto-title, OpenLayers/Layer/MapServer.js) File: MapServer.Untiled (no auto-title, OpenLayers/Layer/MapServer/Untiled.js) @@ -232,21 +262,51 @@ Group: OpenLayers { File: Popup (no auto-title, OpenLayers/Popup.js) File: Anchored (no auto-title, OpenLayers/Popup/Anchored.js) File: AnchoredBubble (no auto-title, OpenLayers/Popup/AnchoredBubble.js) - File: Framed (OpenLayers/Popup/Framed.js) - File: FramedCloud (OpenLayers/Popup/FramedCloud.js) + File: Framed (no auto-title, OpenLayers/Popup/Framed.js) + File: FramedCloud (no auto-title, OpenLayers/Popup/FramedCloud.js) } # Group: Popup File: Projection (no auto-title, OpenLayers/Projection.js) + Group: Protocol { + + File: Protocol (no auto-title, OpenLayers/Protocol.js) + File: HTTP (no auto-title, OpenLayers/Protocol/HTTP.js) + + Group: SQL { + + File: SQL (no auto-title, OpenLayers/Protocol/SQL.js) + File: Gears (no auto-title, OpenLayers/Protocol/SQL/Gears.js) + } # Group: SQL + + } # Group: Protocol + Group: Renderer { File: Renderer (no auto-title, OpenLayers/Renderer.js) + File: Canvas (no auto-title, OpenLayers/Renderer/Canvas.js) File: Elements (no auto-title, OpenLayers/Renderer/Elements.js) File: SVG (no auto-title, OpenLayers/Renderer/SVG.js) File: VML (no auto-title, OpenLayers/Renderer/VML.js) } # Group: Renderer + Group: Request { + + File: Request (no auto-title, OpenLayers/Request.js) + File: XMLHttpRequest (no auto-title, OpenLayers/Request/XMLHttpRequest.js) + } # Group: Request + File: Rule (no auto-title, OpenLayers/Rule.js) + + Group: Strategy { + + File: Strategy (no auto-title, OpenLayers/Strategy.js) + File: BBOX (no auto-title, OpenLayers/Strategy/BBOX.js) + File: Cluster (no auto-title, OpenLayers/Strategy/Cluster.js) + File: Fixed (no auto-title, OpenLayers/Strategy/Fixed.js) + File: Paging (no auto-title, OpenLayers/Strategy/Paging.js) + } # Group: Strategy + File: Style (no auto-title, OpenLayers/Style.js) File: StyleMap (no auto-title, OpenLayers/StyleMap.js) diff --git a/lib/OpenLayers/BaseTypes.js b/lib/OpenLayers/BaseTypes.js index a016e158fb..9660d00e0f 100644 --- a/lib/OpenLayers/BaseTypes.js +++ b/lib/OpenLayers/BaseTypes.js @@ -340,7 +340,7 @@ if (!Number.prototype.limitSigDigs) { */ Number.prototype.limitSigDigs = function(sig) { OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", - {'newMethod':'OpenLayers.String.limitSigDigs'})); + {'newMethod':'OpenLayers.Number.limitSigDigs'})); return OpenLayers.Number.limitSigDigs(this, sig); }; } @@ -409,7 +409,7 @@ if (!Function.prototype.bind) { */ Function.prototype.bind = function() { OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", - {'newMethod':'OpenLayers.String.bind'})); + {'newMethod':'OpenLayers.Function.bind'})); // new function takes the same arguments with this function up front Array.prototype.unshift.apply(arguments, [this]); return OpenLayers.Function.bind.apply(null, arguments); @@ -430,7 +430,7 @@ if (!Function.prototype.bindAsEventListener) { */ Function.prototype.bindAsEventListener = function(object) { OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", - {'newMethod':'OpenLayers.String.bindAsEventListener'})); + {'newMethod':'OpenLayers.Function.bindAsEventListener'})); return OpenLayers.Function.bindAsEventListener(this, object); }; } diff --git a/lib/OpenLayers/Console.js b/lib/OpenLayers/Console.js index bfb40163ff..ec42af93d4 100644 --- a/lib/OpenLayers/Console.js +++ b/lib/OpenLayers/Console.js @@ -233,10 +233,10 @@ OpenLayers.Console = { * If Firebug Lite is included (before this script), re-route all * OpenLayers.Console calls to the console object. */ - if(window.console) { - var scripts = document.getElementsByTagName("script"); - for(var i=0, len=scripts.length; i */ OpenLayers.Control.Attribution = OpenLayers.Class(OpenLayers.Control, { diff --git a/lib/OpenLayers/Control/EditingToolbar.js b/lib/OpenLayers/Control/EditingToolbar.js index 86f49c89d4..d149a8b9b2 100644 --- a/lib/OpenLayers/Control/EditingToolbar.js +++ b/lib/OpenLayers/Control/EditingToolbar.js @@ -13,6 +13,9 @@ /** * Class: OpenLayers.Control.EditingToolbar + * + * Inherits from: + * - */ OpenLayers.Control.EditingToolbar = OpenLayers.Class( OpenLayers.Control.Panel, { diff --git a/lib/OpenLayers/Control/MousePosition.js b/lib/OpenLayers/Control/MousePosition.js index 6d1d73fa04..0629b2fe35 100644 --- a/lib/OpenLayers/Control/MousePosition.js +++ b/lib/OpenLayers/Control/MousePosition.js @@ -9,6 +9,9 @@ /** * Class: OpenLayers.Control.MousePosition + * + * Inherits from: + * - */ OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, { diff --git a/lib/OpenLayers/Control/Navigation.js b/lib/OpenLayers/Control/Navigation.js index 6d7be80d44..09ccbbefde 100644 --- a/lib/OpenLayers/Control/Navigation.js +++ b/lib/OpenLayers/Control/Navigation.js @@ -52,7 +52,7 @@ OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, { * APIProperty: handleRightClicks * {Boolean} Whether or not to handle right clicks. Default is false. */ - handleRightClicks: true, + handleRightClicks: false, /** * Constructor: OpenLayers.Control.Navigation diff --git a/lib/OpenLayers/Control/Pan.js b/lib/OpenLayers/Control/Pan.js index f9dfdc06ef..69c3f47751 100644 --- a/lib/OpenLayers/Control/Pan.js +++ b/lib/OpenLayers/Control/Pan.js @@ -1,9 +1,16 @@ +/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD + * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the + * full text of the license. */ + /** * @requires OpenLayers/Control.js */ /** * Class: OpenLayers.Control.Pan + * + * Inherits from: + * - */ OpenLayers.Control.Pan = OpenLayers.Class(OpenLayers.Control, { diff --git a/lib/OpenLayers/Control/PanPanel.js b/lib/OpenLayers/Control/PanPanel.js index a215414a06..9ef27f9eaf 100644 --- a/lib/OpenLayers/Control/PanPanel.js +++ b/lib/OpenLayers/Control/PanPanel.js @@ -13,7 +13,9 @@ * - * + * + * Inherits from: + * - */ OpenLayers.Control.PanPanel = OpenLayers.Class(OpenLayers.Control.Panel, { diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js index a2e67fc582..82afb107c3 100644 --- a/lib/OpenLayers/Control/Scale.js +++ b/lib/OpenLayers/Control/Scale.js @@ -10,6 +10,7 @@ /** * Class: OpenLayers.Control.Scale * Display a small scale indicator on the map. + * * Inherits from: * - */ diff --git a/lib/OpenLayers/Control/ZoomIn.js b/lib/OpenLayers/Control/ZoomIn.js index 375e0d53c5..9acd5222eb 100644 --- a/lib/OpenLayers/Control/ZoomIn.js +++ b/lib/OpenLayers/Control/ZoomIn.js @@ -1,9 +1,16 @@ +/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD + * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the + * full text of the license. */ + /** * @requires OpenLayers/Control.js */ /** * Class: OpenLayers.Control.ZoomIn + * + * Inherits from: + * - */ OpenLayers.Control.ZoomIn = OpenLayers.Class(OpenLayers.Control, { diff --git a/lib/OpenLayers/Control/ZoomOut.js b/lib/OpenLayers/Control/ZoomOut.js index 16bf7c9c82..7b2c686750 100644 --- a/lib/OpenLayers/Control/ZoomOut.js +++ b/lib/OpenLayers/Control/ZoomOut.js @@ -1,9 +1,16 @@ +/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD + * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the + * full text of the license. */ + /** * @requires OpenLayers/Control.js */ /** * Class: OpenLayers.Control.ZoomOut + * + * Inherits from: + * - */ OpenLayers.Control.ZoomOut = OpenLayers.Class(OpenLayers.Control, { @@ -23,4 +30,4 @@ OpenLayers.Control.ZoomOut = OpenLayers.Class(OpenLayers.Control, { }, CLASS_NAME: "OpenLayers.Control.ZoomOut" -}); \ No newline at end of file +}); diff --git a/lib/OpenLayers/Control/ZoomPanel.js b/lib/OpenLayers/Control/ZoomPanel.js index 6296d15c16..026eb9c21e 100644 --- a/lib/OpenLayers/Control/ZoomPanel.js +++ b/lib/OpenLayers/Control/ZoomPanel.js @@ -1,3 +1,7 @@ +/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD + * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the + * full text of the license. */ + /** * @requires OpenLayers/Control/Panel.js * @requires OpenLayers/Control/ZoomIn.js @@ -16,6 +20,8 @@ * * * + * Inherits from: + * - */ OpenLayers.Control.ZoomPanel = OpenLayers.Class(OpenLayers.Control.Panel, { diff --git a/lib/OpenLayers/Control/ZoomToMaxExtent.js b/lib/OpenLayers/Control/ZoomToMaxExtent.js index a91fa91ea4..7d5a00683a 100644 --- a/lib/OpenLayers/Control/ZoomToMaxExtent.js +++ b/lib/OpenLayers/Control/ZoomToMaxExtent.js @@ -8,7 +8,7 @@ /** * Class: OpenLayers.Control.ZoomToMaxExtent - * Imlements a very simple button control. Designed to be used with a + * Implements a very simple button control. Designed to be used with a * . * * Inherits from: diff --git a/lib/OpenLayers/Format/GML/Base.js b/lib/OpenLayers/Format/GML/Base.js index 7562db737c..dbf5749b4e 100644 --- a/lib/OpenLayers/Format/GML/Base.js +++ b/lib/OpenLayers/Format/GML/Base.js @@ -4,17 +4,9 @@ /** * @requires OpenLayers/Format/XML.js + * @requires OpenLayers/Format/GML.js */ -/** - * Eventually, this will require the OpenLayers.Format.GML. For now, since - * this parser can be included in a lib without the old GML parser, we - * declare the namespace if it doesn't exist. - */ -if(!OpenLayers.Format.GML) { - OpenLayers.Format.GML = {}; -} - /** * Class: OpenLayers.Format.GML.Base * Superclass for GML parsers. diff --git a/lib/OpenLayers/Format/WFS.js b/lib/OpenLayers/Format/WFS.js index 9c942c5b86..82938affbe 100644 --- a/lib/OpenLayers/Format/WFS.js +++ b/lib/OpenLayers/Format/WFS.js @@ -9,6 +9,9 @@ /** * Class: OpenLayers.Format.WFS * Read/Write WFS. + * + * Inherits from: + * - */ OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, { diff --git a/lib/OpenLayers/Protocol.js b/lib/OpenLayers/Protocol.js index 37ed8480f8..926df4fd9d 100755 --- a/lib/OpenLayers/Protocol.js +++ b/lib/OpenLayers/Protocol.js @@ -11,13 +11,13 @@ OpenLayers.Protocol = OpenLayers.Class({ /** * Property: format - * {} + * {} The format used by this protocol. */ format: null, /** * Property: options - * Any options sent to the constructor. + * {Object} Any options sent to the constructor. */ options: null, diff --git a/lib/OpenLayers/Protocol/HTTP.js b/lib/OpenLayers/Protocol/HTTP.js index 76c5fbc83d..515bcb4a23 100644 --- a/lib/OpenLayers/Protocol/HTTP.js +++ b/lib/OpenLayers/Protocol/HTTP.js @@ -19,14 +19,14 @@ OpenLayers.Protocol.HTTP = OpenLayers.Class(OpenLayers.Protocol, { /** * Property: url - * {String} - Service URL, read-only, set through the options + * {String} Service URL, read-only, set through the options * passed to constructor. */ url: null, /** * Property: headers - * {Object} - HTTP request headers, read-only, set through the options + * {Object} HTTP request headers, read-only, set through the options * passed to the constructor, * Example: {'Content-Type': 'plain/text'} */ @@ -34,7 +34,7 @@ OpenLayers.Protocol.HTTP = OpenLayers.Class(OpenLayers.Protocol, { /** * Property: params - * {Object} - Parameters of GET requests, read-only, set through the options + * {Object} Parameters of GET requests, read-only, set through the options * passed to the constructor, * Example: {'bbox': '5,5,5,5'} */ @@ -42,7 +42,7 @@ OpenLayers.Protocol.HTTP = OpenLayers.Class(OpenLayers.Protocol, { /** * Property: callback - * {Object} - Function to be called when the , , + * {Object} Function to be called when the , , * , or operation completes, read-only, * set through the options passed to the constructor. */ @@ -50,7 +50,7 @@ OpenLayers.Protocol.HTTP = OpenLayers.Class(OpenLayers.Protocol, { /** * Property: scope - * {Object} - Callback execution scope, read-only, set through the + * {Object} Callback execution scope, read-only, set through the * options passed to the constructor. */ scope: null, diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js index 807c09973a..dddabda2fd 100644 --- a/lib/OpenLayers/Renderer/SVG.js +++ b/lib/OpenLayers/Renderer/SVG.js @@ -661,7 +661,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, { // If so, add the coordinate of the intersection with the // valid range bounds. if (i > 0) { - if (this.getShortString(components[i + 1])) { + if (this.getShortString(components[i - 1])) { strings.push(this.clipLine(components[i], components[i-1])); } diff --git a/lib/OpenLayers/Strategy.js b/lib/OpenLayers/Strategy.js index 2e682f47da..ba209cd5b6 100755 --- a/lib/OpenLayers/Strategy.js +++ b/lib/OpenLayers/Strategy.js @@ -11,7 +11,7 @@ OpenLayers.Strategy = OpenLayers.Class({ /** * Property: layer - * {} + * {} The layer this strategy belongs to. */ layer: null, @@ -69,7 +69,8 @@ OpenLayers.Strategy = OpenLayers.Class({ }, /** - * Method: setLayer. + * Method: setLayer + * Called to set the property. * * Parameters: * {} diff --git a/tests/Control/Navigation.html b/tests/Control/Navigation.html index 69dd34bcca..b459baa28b 100644 --- a/tests/Control/Navigation.html +++ b/tests/Control/Navigation.html @@ -4,7 +4,7 @@