Changeset 7781

Timestamp:

08/18/08 08:53:06 (4 months ago)

Author:

ahocevar

Message:

"disable z-indexing of elements in the Elements renderer by default". r=elemoine (closes #1679)

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Renderer.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Renderer/Elements.js (modified) (9 diffs)

trunk/openlayers/lib/OpenLayers/Layer/Vector.js

@@ -155 +155 @@
-    
-    /**
-yOrdering
-String} Whether or not externalGraphic y-ordering is enabled on this 
-layer. Default is false
-
-yOrdering: false
-
+rendererOptions
+Object} Options for the renderer. See {<OpenLayers.Renderer>} for
+supported options
+
+rendererOptions: null
+ 
-    /** 
-     * APIProperty: geometryType
@@ -266 +266 @@
-            var rendererClass = OpenLayers.Renderer[this.renderers[i]];
-            if (rendererClass && rendererClass.prototype.supported()) {
-
+
+
-                break;
-            }  

trunk/openlayers/lib/OpenLayers/Renderer.js

@@ -57 +57 @@
-     * Parameters:
-     * containerID - {<String>} 
-
-
+
+
+
+
-        this.container = OpenLayers.Util.getElement(containerID);
-    },

trunk/openlayers/lib/OpenLayers/Renderer/Elements.js

@@ -71 +71 @@
-     * Parameters:
-     * newNode - {DOMElement} The new node to be inserted.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        var nodeId = newNode.id;
-        
@@ -85 +94 @@
-            middle = parseInt((leftIndex + rightIndex) / 2);
-            
-
-
-
-
+
+
-            
-            if (placement > 0) {
@@ -101 +108 @@
-        
-        // If the new node should be before another in the index
-insert the new node before the next; else, lets just
-append the new one on the end, making it the highest in the index order
+return the node before which we have to insert the new one;
+else, return null to indicate that the new node can be appended
-        var nextIndex = rightIndex + 1;
-
-
-
-
-
-
+
+
-    },
-    
@@ -344 +347 @@
-     * Property: Indexer
-     * {<OpenLayers.ElementIndexer>} An instance of OpenLayers.ElementsIndexer 
-
+
+
-     */
-    indexer: null, 
@@ -371 +375 @@
-     * Parameters:
-     * containerID - {String}
-
-
-
+
+
+
+
+
+
-        OpenLayers.Renderer.prototype.initialize.apply(this, arguments);
-
@@ -382 +389 @@
-        this.container.appendChild(this.rendererRoot);
-        
-
+
+
+
-    },
-    
@@ -409 +418 @@
-            }
-        }
-
+
+
+
-    },
-
@@ -498 +509 @@
-        newNode = this.drawGeometryNode(newNode, geometry, style);
-        
-f the node is known to the indexer, remove it so we can
-recalculate where it should go.
-if (this.indexer.exists(newNode)) {
-    this.indexer.remove(newNode);
-}
-
-// Insert the node into the indexer so it can show us where to place it.
-//  Note that this operation is O(log(n)). If there's a performance 
-//  problem (when dragging, for instance) this is likely where it 
-//  would be.
-this.indexer.insert(newNode, this.root);
+nsert the node into the indexer so it can show us where to
+place it. Note that this operation is O(log(n)). If there's a
+// performance problem (when dragging, for instance) this is
+// likely where it would be.
+var insert = this.indexer ? this.indexer.insert(newNode) : null;
+
+if(insert) {
+    this.root.insertBefore(newNode, insert);
+} else {
+    this.root.appendChild(newNode);
+}
-        
-        this.postDraw(newNode); 
@@ -742 +753 @@
-                element.parentNode.removeChild(element);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-            }