Changeset 7897 for trunk/openlayers/lib/OpenLayers

Timestamp:

08/29/08 12:28:20 (3 months ago)

Author:

euzuro

Message:

Fixing the sizing issues with the popups -- all this time, the 'size' parameter we were passing in to init a popup has been the *content* size, not the actual size of the popup. This confusion has stemmed from the fact that we weren't ever differentiating between the two. Now we are. Rename that parameter 'contentSize' in all the constructors. NOTE that this does not *break* API, it is merely renaming a variable. As such, no one should see any difference... other than the fact that autosized popups now stay their correct size when opened and closed repeatedly. Big thanks to jpulles for finding this bug and filing an accurate, informative, and detailed bug report. Thanks to ahocevar and crschmidt for reviewing. (Closes #1586)

Files:

• trunk/openlayers/lib/OpenLayers/Popup.js (modified) (8 diffs)
• trunk/openlayers/lib/OpenLayers/Popup/Anchored.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Popup/Framed.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Popup/FramedCloud.js (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Popup.js

@@ -49 +49 @@
-
-    /** 
+     * Property: contentSize 
+     * {<OpenLayers.Size>} the width and height of the content.
+     */
+    contentSize: null,    
+
+    /** 
-     * Property: size 
-     * {<OpenLayers.Size>} the width and height of the popup.
@@ -184 +190 @@
-    * lonlat - {<OpenLayers.LonLat>}  The position on the map the popup will
-    *                                 be shown.
-size - {<OpenLayers.Size>}      The size of the popup
+contentSize - {<OpenLayers.Size>} The size of the content
-    * contentHTML - {String}          An HTML string to display inside the   
-    *                                 popup.
@@ -191 +197 @@
-    * closeBoxCallback - {Function}   Function to be called on closeBox click.
-    */
-s
+contentS
-        if (id == null) {
-            id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
@@ -198 +204 @@
-        this.id = id;
-        this.lonlat = lonlat;
-
+
+
-                                  : new OpenLayers.Size(
-                                                   OpenLayers.Popup.WIDTH,
@@ -219 +226 @@
-
-        var id = this.div.id + "_contentDiv";
-s
+contentS
-                                                    null, "relative");
-        this.contentDiv.className = this.contentDisplayClass;
@@ -311 +318 @@
-
-        this.moveTo(px);
-
-s
+ && !this.size
+contentS
-        }
-        this.setBackgroundColor();
@@ -400 +407 @@
-     *
-     * Parameters:
-
-
-
-
-
-
-
+
+
+
+
+
-        
-        // if our contentDiv has a css 'padding' set on it by a stylesheet, we 
@@ -434 +439 @@
-        // me want to shoot someone, but so it goes.
-        if (OpenLayers.Util.getBrowserName() == "msie") {
-
-
+
+
+
+
-        }
-

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

@@ -36 +36 @@
-    * id - {String}
-    * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-    * contentHTML - {String}
-    * anchor - {Object} Object which must expose a 'size' <OpenLayers.Size> 
@@ -43 +43 @@
-    * closeBoxCallback - {Function} Function to be called on closeBox click.
-    */
-s
+contentS
-                        closeBoxCallback) {
-
-
+
+
+
-        OpenLayers.Popup.prototype.initialize.apply(this, newArguments);
-
@@ -109 +110 @@
-     * 
-     * Parameters:
-
+
+
-     */
-s
+contentS
-        OpenLayers.Popup.prototype.setSize.apply(this, arguments);
-
@@ -165 +167 @@
-    calculateNewPx:function(px) {
-        var newPx = px.offset(this.anchor.offset);
+        
+        //use contentSize if size is not already set
+        var size = this.size || this.contentSize;
-
-        var top = (this.relativePosition.charAt(0) == 't');
-this.
+
-        
-        var left = (this.relativePosition.charAt(1) == 'l');
-this.
+
-
-        return newPx;   

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

@@ -29 +29 @@
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
@@ -37 +37 @@
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-s
+contentS
-                        closeBoxCallback) {
-        
@@ -82 +82 @@
-     * 
-     * Parameters:
-
+
+
-     */
-s
+contentS
-        OpenLayers.Popup.Anchored.prototype.setSize.apply(this, arguments);
-

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

@@ -86 +86 @@
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
@@ -94 +94 @@
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-s
+contentS
-                        closeBoxCallback) {
-
@@ -189 +189 @@
-     * 
-     * Parameters:
-
-
-
+
+
+
+
-        OpenLayers.Popup.Anchored.prototype.setSize.apply(this, arguments);
-
@@ -297 +298 @@
-        }
-        
-
+size && this.
-            var position = this.positionBlocks[this.relativePosition];
-            for (var i = 0; i < position.blocks.length; i++) {

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

@@ -204 +204 @@
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
@@ -212 +212 @@
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-s
+contentS
-                        closeBoxCallback) {
-