[OpenLayers-Commits] r2058 - in sandbox/camptocamp/advancedcontrol: examples lib lib/OpenLayers lib/OpenLayers/Control
commits at openlayers.org
commits at openlayers.org
Thu Dec 14 11:28:17 EST 2006
Author: bertil
Date: 2006-12-14 11:28:15 -0500 (Thu, 14 Dec 2006)
New Revision: 2058
Added:
sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Label.js
Modified:
sandbox/camptocamp/advancedcontrol/examples/AdvancedControl.html
sandbox/camptocamp/advancedcontrol/lib/OpenLayers.js
sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control.js
sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Button.js
sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Checkbox.js
sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Choice.js
sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Container.js
Log:
new Label control
Modified: sandbox/camptocamp/advancedcontrol/examples/AdvancedControl.html
===================================================================
--- sandbox/camptocamp/advancedcontrol/examples/AdvancedControl.html 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/examples/AdvancedControl.html 2006-12-14 16:28:15 UTC (rev 2058)
@@ -29,8 +29,14 @@
var choice1 = new OpenLayers.Control.Choice("radio");
container.addControl(choice1);
+ var label1 = new OpenLayers.Control.Label("label choice 1", choice1);
+ container.addControl(label1);
+
var choice2 = new OpenLayers.Control.Choice("radio");
container.addControl(choice2);
+
+ var label1 = new OpenLayers.Control.Label("label choice 2", choice2);
+ container.addControl(label1);
var check = new OpenLayers.Control.Checkbox("check");
container.addControl(check);
Modified: sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Button.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Button.js 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Button.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -22,8 +22,8 @@
* @param {Object} options
*/
initialize: function(name, icon, options) {
+ this.controlName = "olButton";
OpenLayers.Control.prototype.initialize.apply(this, options);
- this.controlName = "olButton";
this.name = name;
this.icon = icon;
},
Modified: sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Checkbox.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Checkbox.js 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Checkbox.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -22,8 +22,8 @@
* @param {Object} options
*/
initialize: function(name, options) {
+ this.controlName = "olCheckbox";
OpenLayers.Control.prototype.initialize.apply(this, options);
- this.controlName = "olCheckbox";
this.name = name;
},
Modified: sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Choice.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Choice.js 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Choice.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -22,8 +22,8 @@
* @param {Object} options
*/
initialize: function(name, group, options) {
+ this.controlName = "olChoice";
OpenLayers.Control.prototype.initialize.apply(this, options);
- this.controlName = "olChoice";
this.name = name;
},
@@ -39,7 +39,6 @@
this.div.type = "radio";
this.div.id = this.id;
this.div.name = this.name;
- this.div.appendChild(document.createTextNode(this.name));
this.div.className = this.controlName;
}
if (px != null) {
Modified: sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Container.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Container.js 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Container.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -20,8 +20,8 @@
* @param {Object} options
*/
initialize: function() {
+ this.controlName = "olContainer";
OpenLayers.Control.prototype.initialize.apply(this, arguments);
- this.controlName = "olContainer";
this.controls = [];
},
@@ -33,7 +33,7 @@
*/
draw: function (px) {
OpenLayers.Control.prototype.draw.apply(this, arguments);
-
+
var containerHeader = document.createElement("div");
containerHeader.className = this.controlName+"Header";
this.div.appendChild(containerHeader);
Added: sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Label.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Label.js (rev 0)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control/Label.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -0,0 +1,56 @@
+/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
+ * for the full text of the license. */
+
+/**
+ * @class
+ *
+ * @requires OpenLayers/Control.js
+ */
+OpenLayers.Control.Label = OpenLayers.Class.create();
+OpenLayers.Control.Label.prototype = OpenLayers.Class.inherit( OpenLayers.Control, {
+
+ name: null,
+
+ icon: null,
+
+ actionListeners: null,
+
+ /**
+ * @constructor
+ *
+ * @param {Object} options
+ */
+ initialize: function(name, reference, options) {
+ this.controlName = "olLabel";
+ OpenLayers.Control.prototype.initialize.apply(this, options);
+ this.name = name;
+ this.reference = reference;
+ },
+
+ /**
+ * @param {OpenLayers.Pixel} px
+ *
+ * @returns A reference to the DIV DOMElement containing the control
+ * @type DOMElement
+ */
+ draw: function (px) {
+ if (this.div == null) {
+ this.div = document.createElement("label");
+ this.div.id = this.id;
+ this.div.setAttribute("for", this.reference.id);
+ this.div.name = this.name;
+ this.div.appendChild(document.createTextNode(this.name));
+ this.div.className = this.controlName;
+ }
+ if (px != null) {
+ this.position = px.clone();
+ }
+ this.moveTo(this.position);
+
+ return this.div;
+ },
+
+ CLASS_NAME: "OpenLayers.Control.Choice"
+
+});
\ No newline at end of file
Modified: sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control.js 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers/Control.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -31,9 +31,12 @@
*/
initialize: function (options) {
OpenLayers.Util.extend(this, options);
-
- this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
- this.controlName = "olControl";
+
+ this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
+
+ if(!this.controlName) {
+ this.controlName = "olControl";
+ }
},
/**
Modified: sandbox/camptocamp/advancedcontrol/lib/OpenLayers.js
===================================================================
--- sandbox/camptocamp/advancedcontrol/lib/OpenLayers.js 2006-12-14 15:42:24 UTC (rev 2057)
+++ sandbox/camptocamp/advancedcontrol/lib/OpenLayers.js 2006-12-14 16:28:15 UTC (rev 2058)
@@ -95,6 +95,7 @@
"OpenLayers/Control/Button.js",
"OpenLayers/Control/Choice.js",
"OpenLayers/Control/Checkbox.js",
+ "OpenLayers/Control/Label.js",
"OpenLayers/Control/MouseListener.js",
"OpenLayers/Control/MouseDefaults.js",
"OpenLayers/Control/MouseToolbar.js",
More information about the Commits
mailing list