From cb3af3eabab366a651c05f777de4551e0bacf410 Mon Sep 17 00:00:00 2001
From: crschmidt <crschmidt@crschmidt.net>
Date: Wed, 18 Oct 2006 16:50:07 +0000
Subject: [PATCH] Add the ability to add a close button to popups via a final
 param to the constructor of a popup.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@1704 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 examples/popups.html                   |   3 ++-
 img/close.gif                          | Bin 0 -> 1078 bytes
 lib/OpenLayers/Popup.js                |  20 +++++++++++++++++++-
 lib/OpenLayers/Popup/Anchored.js       |   5 +++--
 lib/OpenLayers/Popup/AnchoredBubble.js |   3 ++-
 5 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 img/close.gif

diff --git a/examples/popups.html b/examples/popups.html
index 2368008958..2b6855c17c 100644
--- a/examples/popups.html
+++ b/examples/popups.html
@@ -37,7 +37,8 @@
             popup = new OpenLayers.Popup("chicken", 
                                          new OpenLayers.LonLat(5,40),
                                          new OpenLayers.Size(200,200),
-                                         "example popup");
+                                         "example popup",
+                                         true);
         
             map.addPopup(popup);
         }        
diff --git a/img/close.gif b/img/close.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a8958de9b429ae00f56bb282c4b133ecbaf334bd
GIT binary patch
literal 1078
zcmZ?wbhEHb6l4%&_|5<V|NsC0{`lF~M^7(H*<6+eBHPQd_E!`fuP8ZRv<!Z>bmP+{
z8=fxT^nBIU?+>5;c=qzk<7f96^e*$8T;?~uENp&7)bfg`)n!quD`Hlc#jGv?Npb7T
z5;m8BNYduAl<gH+hs&}KSL7Y9C^(%|a6F;lbVbSKgrf6tMaR>su4mLePHK3b)AGKc
z>vvYy?~Ja`8C~BqdcMbXy-w@-o;M0SZs2#)(C>ti{{_>K3ud9`%tFqahh1=qzu=N^
z(KYdcYr<u}%q#v`m;E!Z1ZKZZYkHH_`mS#3+s5f{rYw6medW7ZtDi32_<Z@6XUjJ~
zTfXJ#vQ5udZhgLX$BT74p99hQU9UFpd%f+ztF8NAZ9VXM*O52-Pkev!;t7NCJqG=|
z3<h@?^zSejJYh6`%xLtO(fARg(IZCV+suZySd4D589x+pcr5DlP|WF(xbq_kAaZ#k
z<@Q1+?3I4ROCU0gdSx8_(m48sS?o*mxEJPeFRc<@S|z>!BJ0Fg_9;)jvY-3rJ@d_b
z;g|p1FaMce!3+O_m%+ua)0*F9w!O`4eV5h#CadjzZr8iq&UblTZ>lH1shjq;e)_w{
z8SffrzH6KFdg79A^EdrixaIreZQqw{`|<wczu$lU{r&g<_x*o={{mwc9K)jo&Ja-i
z$->CMFrPsOqym&D7&!hjSaZsFY<S?nDrypQ;lslN9Re&Oc`Ft;D6kr)?OD@V?CvjT
znX_+(ptIwGHluW}Edo<kbSOD!`z$bA?6`oHQ%fn}q~S>+6^S6WB|jz|Trx{Mnn_1s
z(GvD44549L9x7aLo?~ylhNYlD*^7bAh~uKBLckGOm;R=dk17q5h2<wnd~{SOI5N+9
zy4KkWfd=kA)fr+xJrxXC<XqhwbZ)R5yezCVMe3`f;)cU>91JB`GLjy9F{oMb+*G{n
z$vj&$l*#1B#1xKc48bu6R^EK+G(&`W$q9!^nnL`#vm$DCCS2l?64B-|G<uW~z$=w`
vEMY^($J5eQHGjUWe9Xo(Q%{&hN%&4dBQpn!x`)Jr35iLr%^x_~SQxAUS=V(k

literal 0
HcmV?d00001

diff --git a/lib/OpenLayers/Popup.js b/lib/OpenLayers/Popup.js
index bef6915104..ed2242289e 100644
--- a/lib/OpenLayers/Popup.js
+++ b/lib/OpenLayers/Popup.js
@@ -60,8 +60,9 @@ OpenLayers.Popup.prototype = {
     * @param {OpenLayers.LonLat} lonlat
     * @param {OpenLayers.Size} size
     * @param {String} contentHTML
+    * @param {Boolean} closeBox
     */
-    initialize:function(id, lonlat, size, contentHTML) {
+    initialize:function(id, lonlat, size, contentHTML, closeBox) {
         if (id == null) {
             id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
         }
@@ -90,6 +91,23 @@ OpenLayers.Popup.prototype = {
         this.contentDiv.className = 'olPopupContent';                                            
         this.div.appendChild(this.contentDiv);
 
+        if (closeBox == true) {
+           // close icon
+            var closeSize = new OpenLayers.Size(17,17);
+            var img = OpenLayers.Util.getImagesLocation() + "close.gif";
+            var closeImg = OpenLayers.Util.createAlphaImageDiv(this.id + "_close", 
+                                                                null, 
+                                                                closeSize, 
+                                                                img);
+            closeImg.style.right = this.padding + "px";
+            closeImg.style.top = this.padding + "px";
+            this.div.appendChild(closeImg);
+
+            var closeEvents = new OpenLayers.Events(this, closeImg);
+            closeEvents.register("mousedown", this, this.hide);
+
+        }
+
         this.registerEvents();
     },
 
diff --git a/lib/OpenLayers/Popup/Anchored.js b/lib/OpenLayers/Popup/Anchored.js
index f78c47fa12..a9b39edfad 100644
--- a/lib/OpenLayers/Popup/Anchored.js
+++ b/lib/OpenLayers/Popup/Anchored.js
@@ -31,9 +31,10 @@ OpenLayers.Popup.Anchored.prototype =
     *                         - 'size' (OpenLayers.Size) and 
     *                         - 'offset' (OpenLayers.Pixel) 
     *                         (this is generally an OpenLayers.Icon)
+    * @param {Boolean} closeBox
     */
-    initialize:function(id, lonlat, size, contentHTML, anchor) {
-        var newArguments = new Array(id, lonlat, size, contentHTML);
+    initialize:function(id, lonlat, size, contentHTML, anchor, closeBox) {
+        var newArguments = new Array(id, lonlat, size, contentHTML, closeBox);
         OpenLayers.Popup.prototype.initialize.apply(this, newArguments);
 
         this.anchor = (anchor != null) ? anchor 
diff --git a/lib/OpenLayers/Popup/AnchoredBubble.js b/lib/OpenLayers/Popup/AnchoredBubble.js
index a4da2dc4da..4b271cff68 100644
--- a/lib/OpenLayers/Popup/AnchoredBubble.js
+++ b/lib/OpenLayers/Popup/AnchoredBubble.js
@@ -28,8 +28,9 @@ OpenLayers.Popup.AnchoredBubble.prototype =
     *                         - 'size' (OpenLayers.Size) and 
     *                         - 'offset' (OpenLayers.Pixel) 
     *                         (this is generally an OpenLayers.Icon)
+    * @param {Boolean} closeBox
     */
-    initialize:function(id, lonlat, size, contentHTML, anchor) {
+    initialize:function(id, lonlat, size, contentHTML, anchor, closeBox) {
         OpenLayers.Popup.Anchored.prototype.initialize.apply(this, arguments);
     },