Changeset 6727

Timestamp:

03/31/08 01:55:12 (5 months ago)

Author:

crschmidt

Message:

Add 'allowSelection' option to controls, to determine whether they allow
selection. Use CSS ClassName in FF, and onselectstart attribute in IE, to
control selection. Fix inappropriate overriding of className in some Control
subclasses in order to let this work. Prevents accidental selection of controls
in IE and FF. r=euzuro. (Closes #1378)

Files:

• trunk/openlayers/lib/OpenLayers/Control.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Control/MousePosition.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/Permalink.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/Scale.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/ScaleLine.js (modified) (1 diff)
• trunk/openlayers/theme/default/style.css (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control.js

@@ -80 +80 @@
-
-    /** 
+     * Property: allowSelection
+     * {Boolean} By deafault, controls do not allow selection, because
+     * it may interfere with map dragging. If this is true, OpenLayers
+     * will not prevent selection of the control.
+     * Default is false.
+     */
+    allowSelection: false,  
+
+    /** 
-     * Property: displayClass 
-     * {string}  This property is used for CSS related to the drawing of the
@@ -241 +250 @@
-            this.div = OpenLayers.Util.createDiv(this.id);
-            this.div.className = this.displayClass;
+            if (!this.allowSelection) {
+                this.div.className += " olControlNoSelect";
+                this.div.setAttribute("unselectable", "on", 0);
+                this.div.onselectstart = function() { return(false); }; 
+            }    
-            if (this.title != "") {
-                this.div.title = this.title;

trunk/openlayers/lib/OpenLayers/Control/MousePosition.js

@@ -92 +92 @@
-            this.div.left = "";
-            this.div.top = "";
-            this.div.className = this.displayClass;
-            this.element = this.div;
-        }

trunk/openlayers/lib/OpenLayers/Control/OverviewMap.js

@@ -205 +205 @@
-        // map viewport.
-        if(!this.outsideViewport) {
-=
++= " " +
-            var imgLocation = OpenLayers.Util.getImagesLocation();
-            // maximize button div

trunk/openlayers/lib/OpenLayers/Control/Permalink.js

@@ -110 +110 @@
-          
-        if (!this.element) {
-            this.div.className = this.displayClass;
-            this.element = document.createElement("a");
-            this.element.innerHTML = OpenLayers.i18n("permalink");

trunk/openlayers/lib/OpenLayers/Control/Scale.js

@@ -44 +44 @@
-        if (!this.element) {
-            this.element = document.createElement("div");
-            this.div.className = this.displayClass;
-            this.div.appendChild(this.element);
-        }

trunk/openlayers/lib/OpenLayers/Control/ScaleLine.js

@@ -82 +82 @@
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        if (!this.eTop) {
-            this.div.className = this.displayClass;
-            this.div.style.display = "block";
-            this.div.style.position = "absolute";

trunk/openlayers/theme/default/style.css

@@ -241 +241 @@
-  cursor: pointer;
-}
+
+.olControlNoSelect {
+ -moz-user-select: none;
+}