Changeset 7684

Timestamp:

08/03/08 14:47:52 (4 months ago)

Author:

crschmidt

Message:

Improve getRenderedDimensions to take into account a CSS class. Refactor some
popup code to take advantage of this, to provide a better hint to the
getRenderedDimensions call as to what is going on. Patch from sbenthall, r=me,
includes a manual acceptance test (only because the testing framework makes
these kinds of things hard). Manually confirmed to work with the sundials.html
example, tested with that and manual test in IE6, IE7, FF2-Win FF3-Mac FF2-Mac
Safari-Mac Opera-Win, and in all browsers it worked. (Hooray!) Nice one,
sbenthall. (Closes #1500)

Files:

• trunk/openlayers/lib/OpenLayers/Popup.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Popup/FramedCloud.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Util.js (modified) (2 diffs)
• trunk/openlayers/tests/manual/rendered-dimensions.html (added)

trunk/openlayers/lib/OpenLayers/Popup.js

@@ -118 +118 @@
-
-    /** 
+     * Property: displayClass
+     * {String} The CSS class of the popup.
+     */
+    displayClass: "olPopup",
+
+    /** 
+     * Property: contentDisplayClass
+     * {String} The CSS class of the popup content div.
+     */
+    contentDisplayClass: "olPopupContent",
+
+    /** 
-     * Property: padding 
-     * {int or <OpenLayers.Bounds>} An extra opportunity to specify internal 
@@ -199 +211 @@
-        this.div = OpenLayers.Util.createDiv(this.id, null, null, 
-                                             null, null, null, "hidden");
-'olPopup'
+this.displayClass
-        
-        var groupDivId = this.id + "_GroupDiv";
@@ -209 +221 @@
-        this.contentDiv = OpenLayers.Util.createDiv(id, null, this.size.clone(), 
-                                                    null, "relative");
-'olPopupContent';                                            
+this.contentDisplayClass;
-        this.groupDiv.appendChild(this.contentDiv);
-        this.div.appendChild(this.groupDiv);
@@ -499 +511 @@
-     */
-    setContentHTML:function(contentHTML) {
+
+        var preparedHTML;
-        if (contentHTML != null) {
-            this.contentHTML = contentHTML;
-        }
- 
+
-        if (this.autoSize) {
-
+
+
+
-            // determine actual render dimensions of the contents
-            var realSize = 
-
+
+
-
-            // is the "real" size of the div is safe to display in our map?
@@ -536 +553 @@
-                    // run getRenderedDimensions() again with a fixed dimension
-                    var clippedSize = OpenLayers.Util.getRenderedDimensions(
-
+
+
-                    );
-                    

trunk/openlayers/lib/OpenLayers/Popup/FramedCloud.js

@@ -16 +16 @@
-OpenLayers.Popup.FramedCloud = 
-  OpenLayers.Class(OpenLayers.Popup.Framed, {
+
+    /** 
+     * Property: contentDisplayClass
+     * {String} The CSS class of the popup content div.
+     */
+    contentDisplayClass: "olFramedCloudPopupContent",
-
-    /**
@@ -211 +217 @@
-        this.imageSrc = OpenLayers.Util.getImagesLocation() + 'cloud-popup-relative.png';
-        OpenLayers.Popup.Framed.prototype.initialize.apply(this, arguments);
-"olFramedCloudPopupContent"
+this.contentDisplayClass
-    },
-

trunk/openlayers/lib/OpenLayers/Util.js

@@ -1375 +1375 @@
- *     
- * Parameters:
+ * contentHTML
- * size - {<OpenLayers.Size>} If either the 'w' or 'h' properties is 
- *     specified, we fix that dimension of the div to be measured. This is 
- *     useful in the case where we have a limit in one dimension and must 
- *     therefore meaure the flow in the other dimension.
+ * options - {Object}
+ *     displayClass - {String} Optional parameter.  A CSS class name(s) string
+ *         to provide the CSS context of the rendered content.
- * 
- * Returns:
- * {OpenLayers.Size}
- */
-
+, options
-    
-    var w, h;
@@ -1403 +1407 @@
-        }
-    }
+
+    //add css classes, if specified
+    if (options && options.displayClass) {
+        container.className = options.displayClass;
+    }
-    
-    // create temp content div and assign content