From a0d3eeaac8caf127bcf2655382501691fc4a0fd1 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 20 Aug 2009 18:51:39 +0000
Subject: [PATCH] fixed 10640, 10639, 10625: Map point save HTML/JS

---
 docs/changelog/7.x.x.txt                      |   3 +++
 .../default-map-point-edit.wgpkg              | Bin 1116 -> 1120 bytes
 .../default-map-point-view.wgpkg              | Bin 1095 -> 1096 bytes
 .../packages-7.7.18/default-map-view.wgpkg    | Bin 1087 -> 1217 bytes
 lib/WebGUI/Asset/MapPoint.pm                  |   4 ++++
 lib/WebGUI/Asset/Wobject/Map.pm               |   6 +++++-
 www/extras/yui-webgui/build/map/map.js        |  19 +++++++++++++-----
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1fbd37f1e..1c0e35461 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -24,6 +24,9 @@
  - fixed SMS/Email notification handling (Patrick Donelan, SDH Consulting)
  - fixed #10624: map template problem with floats
  - fixed #10793: Map->Add Point photo field missing
+ - fixed #10625: Map point no save button
+ - fixed #10639: Map: Can't edit or delete points
+ - fixed #10640: Map: points not working correctly
 
 7.7.17
  - fixed #10697: Story: Image crowds text
diff --git a/docs/upgrades/packages-7.7.18/default-map-point-edit.wgpkg b/docs/upgrades/packages-7.7.18/default-map-point-edit.wgpkg
index 9aac85cb415e3dda1ef0fccb08d5735e19ccdfbe..c04b729348bfeb0d471d8cecebdad83fa2e24a8b 100644
GIT binary patch
literal 1120
zcmV-m1fTmKiwFP!00000|Ls?8Z`(Ey_UHZzL7(SXk}Z2SyZ~-qmJ~_gCC;*T84OyY
zWwx@&k(6IL^uLd!#7Lr*!~q(h!y+J2z<cia@Q(MKa?p7F$8nsV?>8Fq-R-Kk<8>Mh
z>)~-4uIqK$ZMWlhy@urqT)SZjm)Cz%#sL-7)^HZ3=<)poY(9V7EDtB1>~Qk^A9)mO
zxA^V%)!*L1XNHsSbOsTz+Y$8^@4EW?UDq}0-|;%)8aUr+|0lz|R{am2-1Ubs{_{>W
zq0Qlv#DK#o;2Z>tB}_Q8t%3FDUq2~3<Cua7mX`>{1X7Nm0;(`FQb3`I6TaU{tlhSi
zzcj>v@ska~R9HvKCrRV@!7SQ~tN1oaXE9<67#6+>T;HK2#A_AQDGY3zV8YODIJn^y
zoIwyyK*Yu%_#(myLX|D?I)U_-L3*xiWwI6b9Y??z<hc_*TR69Wk3PVUz0^yZ&Aa2~
z`_ZUin9^90Uf?BcEdh}~O`UGm3gH~2F>k^U@uoBpj1peBBX)+u5GE>yTV5Yi%rW1R
zENP{jL=>mwJUkH*l~<_-dSA6Z4AII8L|ND`_x3uPN(z^Nj3t44`|zILCqpi-#dHOz
zHOF*0U5I=_npt8ngYn@6@faE?F4qo+tqh^UWPct*7EnYu!e(Gy#yYP%IAe&Ln+Ua*
zt91^eFr<(%gB8eD-Kt0Rd^yIeVlwhah;NOMfmo`8-pH%m67^Z3Bru7qdtT@D36a(q
z3v+B8;m~yZiiljTb3DRn!s!mVY_-l|yugVWpUAa3@G00B$DV^t9q>e4UlbcyDA(%H
zf&<3}I2W1oP#LRU)j~0_f^`>kjxpC4v?Z?hVX0w~1*C}I()g6(<rq*QajFeUoug`V
zv;av|D_|&rxdz&5M%GNtVn5YbS74d7r?|ww-kuKzBdHvN!6cX40xs3@5{GDxGNH0v
z&v$xW$M5(BNOhJXeVoaLC7aw5O>3#HEs(he{ElEInZ3e<m~;ZOIAd1Q6!ry?E6fFl
z0LUga(<7!rI+4x27X_KjR0*>Uh!_^DvY;yky+L1d4n40_1p=thWVOd5X&VgACYKkx
zNkr@dOQp|-Petny%Ts0^s$6qr>-T&8zF%QP;R-R4kYhcf>WYKZn9&!coYn<ipC_k6
zK(lO=OeureY|@j;WS58w#0UtoJZW`qDQ$lkom$n4F=s!c?MCC}x^4~k6?Kh#fud`d
z{p4Ju_tbLBIM9xe>v+$pxW?V=FX7tdW%{kX_7iW7eqOmX@@d)Ds68}WLth}+W;K*r
z8x_ixdT6LLOai(ke5~83Bnuow`6pL^F0T;!Jh~pIlk4>2<4Hs*`>m{SH(Mr}!fYnh
z##$Z9Uwc9l)rV=FD5~$-YVWsyb~;YCThde^Sz?^z^k#IkoX){j_~{RyU*k6Mov0lZ
m^d6c%=O;g~zrFkR!~93^M&vC6ZyET%WZ+*h)4`Ge6aWCXVJT1m

literal 1116
zcmV-i1f%;OiwFP!00000|Ls<7ZyGre=5v3=YCj)gSy)I=E)pflg{q0TCTV)ToRDD+
z_`2Ax?d7GX{`Zc(Yj#;S36UD9C&f~-$n(tj@r>uO4=OJ|JkM(fL8YR<t(N(EezQ_>
zHp8pb>wdFQ_ZmI`ojTxK6$e~ie#BBC0o0awG>yr_>j7*sdDyHs2P4^>{{ByfVO`Ju
z2S?_&fAFtl^e62BBDR`PZ}^tgKL{E@q5e(3=~o=@C$0Zzn3t;m!K17GGRFVjKohzO
z&v}Ft9wMdCcs9pWN!RH(fB*BFu}j4Sn&SKv7mQ<}2sS_yMn@V83~|D@YmIdquJPA~
z2uXFe;!J?GYkX)NMH@4;moo8P9*-g-XE@A!DPG<Y8nUGc>SYGGri@Fn8xF6OKo=N=
zH)tvcX#54j0imrW*^**$E3xPsTb}He`;H@$606jSUCg}Ouiba}uXgOyYW424`nKE6
z7{($pq-Si7Yjec)U)82t)<Qf%aipp^B&w=SoDr%rcOoxH7-DK-)bsNL!4y+#o+K@o
zlc``a?}uj)(Rk%*VAnPC$01obV<?OK{oY+phnm7A;sZ_K-aWY&_w-o7u^29pa3)O5
zhcn107KtT7BOIOF5EbD9O6j?i<643+VUnMxSdInZim+l}TgEc4J3Nv^6&C@u*0W^}
z-7pkb$^t8t%+|L(w)dA}{B2A^zDLx$5ONGtWzcJVlxt9*1)<|2adXbgygn0N8!#|O
zPLG8}w{L{&*)qo-i>VSj<dWGkhrx`|VtlUW%E0GnRoM0ft;&FBaC}Krz+ydDh6WCb
z6~L*;^h0CZ_S!DggfV3gVhxV*Nv<*I3=5)eMRYFMe1HT<nK|yc4ly<8%@CcI3KgL^
z)jHSQg(bIRww`IAD>P5q5Dx1fxBX71s}-Wtxk+U;gKHJMWFeW5M3CINA9!uQ(X6*J
zkm(>p`ZSRTM>n$r&FPr#%#dlXe<V1O#&%{RQahnhlrYO_hx|hL6;r@rjC3;=(*x=s
z-{>aZi-JyOYy{Xv94>`LUbu}?UXyPrhgSPABgl~e?KNvWkhV_e;^y-GZW4)n&$OZ^
zm&}%?6Pc#0xT$>2jqT{DeRLGG{oJ__ctIp2<kVh8WyK-pI<W^NpVk>$_USnYWs;4Y
zDV8|7gY1n|WJlouNsh)zo~#PjjD~NnNUPr2b>=>y;e`fE_1ih#SG+Cq8Om*4_LFUk
z-cz%k!iIJP+s1oJtu5|)f2p=E&(mq^wVy~^^wSD$k&nx>MeU)@7WxcfE><H|<>P`P
zV>%XVt_HScat)`@G<`<#-q1(XyZzG(K7IW-Tpsr8eR%F|&OVXXYY7cdY#h_FRtfSi
zIFLW{*enx3^G4n7^Twgq^jfW)eu6x~)sfO0iPd~KL094DPl5Wt8a(i(jcG=2)8HvT
i{b>IF=KC-6%6}#Dnt|60yk=lG13v%<(%_Q-6aWC(y(vln

diff --git a/docs/upgrades/packages-7.7.18/default-map-point-view.wgpkg b/docs/upgrades/packages-7.7.18/default-map-point-view.wgpkg
index 1a4cc31844fa1dccb3d04b1c3d976834bf79d15b..5be271821d2edd64be549bdf9c4345ae1ecd85fc 100644
GIT binary patch
delta 1005
zcmV<J0}}kl2*?PKX@9w`cGIm{uCVXaEaCF<BV!y;0c{DVQHGwLPnd<_(`vamG4jR9
z=l^6V)UN*byXxIL`j6rCKx+^Y+bvOV@!VB^zvcQ{^=~y>VjDOIntyMYm#Y8K-dTSb
z<(D_232hD&5(5tJ0q0;gPhiTKZS}0b|9PwQjAIHSXo?8M1b<SFpfXfpWTY8|B2Mtz
zTH4y4t^B1T28_R75ln^lo$^VuI4;$qy|{{RlWZCzHiv=sP2utur2$^5ppI6sb&3f?
zkHf(gr{EldU<@KQ0<#AZP5`P*iI*v)Hw@CD(wSf@?vES+V~`h4S$7exJn!!G!H<Dk
z|Kr3z``C#z!hej$3iKQ&u#o^FfAvkeStEcU$YNfXQi4&+>k9;z+8wcT6a+9;F<etV
zqL^d8CVA3~oJ167WEi{;5LaGC4L0*Cd7q1#-!A~QIN~uJ^ry5jn9xa@D^O^GAfS*j
zcc4wRNLu$BDh3L7`ZXW>3DF+E8RBch$M_Ur)CL*6)qhj!w+iUoP9rY9cO(6b$O#U_
z+RI#&5`|NVVazrb0!NPODQz)Zb&(pWeyd<6bDYA#NdEUMjU^ZF%UB3jgEO!)oup`=
z3rqlt2Yq18DGYy|*z%L(o}M)~nAk>A3ZLq#Dk~@mVi<@;a6IUvB(fNtiTM9s=iG5a
z<Dc{-TYvUH|1z;Hb3Yk7J)J{}xNtwCI2i#dxJm6_W6P_opUgoT?PMO5!h*bPb-3*~
z?(}>!K~(GtBza%m!s+if!(Q*5Z24YqT=1kem$Y_?0~Dg1VQjbQJDsK{PB3kx8ccyc
z&HLTD1jHK2ez!hV`n_mgC6ol((LoTCEe)n|j(^M`1NMN(73KoN3~+>VvM|yk=sX+C
z9)A`DnaoTvstt%>`Gv{Eiu$h6=K@39Io1FPpn^=*98aXJ*E=6yUOY}BVi#Cabbe}7
zNE)#sW&3Kbblq;J+x0t5W8oAo5EBVG-JC6DaST#K>U`L25HqcFyd0)ym?n8P3{}Qp
zet)QJj+kw9sn|e_fLWd=QEgT1Mzz=*I@afttvkdZ<y`oEguLzZ95OC_4Ca;RgYmha
zh|2&44VJ80e3v9#8kTfhnwFBMDE2@ETtfIB@-3a7N4%x^!AQ4^xJ94`BwU!z=$i1+
zrX!4g;vg!nJ@wm*@dtL*K~cQ^fY*ul>1N~IiE-^g?0U__{@(5j)sdS<H*Z{m-PGl9
z7r&`HWwnjHW2bfO9UE;d*hicU1-vO;CHEn?3jVtD`JdP$z7u%{yt01_eDad}_088G
b=2rd+<TV4Y8F<aW%V*#lW{(Z+02BZKCSvIu

delta 1004
zcmV<I0~7qn2*(JJX@5Fiv+dO^SJ_*_<>g1lIG_UB5>BHGJw2Z=3&W??a&cnhi<8g)
z$xx_W{qJ|xyLa>-!|8$6AR@L~qTb@UtNwn=^|$KZYI>cT<s4}Ky<uLe{zrRf{b7_}
z-iRi&IZQ|lIJ^g(gV{WRDQC9Tv;O|)t<p1&DTtscA`}xyIe&u6P=%3^W)zAz!EbA6
zYkRixmx>rL{(eO;720>oC(YuxREzfFD!xs!X^hw$2HH1;%UhHNc&UOqTEW&SCJa3e
z2Unbea|nVlh}a0s9z-|+s4^v9rjXt+NQX*if~~keas-S)UN~jlMY!_3yVD0h25$Y2
z6aVaEC(;Nr8h<O$bDY3N0*L(8H|b`L0EQrod0k2gMk%i^5L{|^#LiI=z*NO>P5Fpo
zj`^D8Ni%X1QJj%s@IF9Xc^Ng>%&X*mE^2<i0Mz1$$8gY}(#BvyCuy!gp#_3~LdM*I
zHq|0&-EXKEDBS7SeC#Jgd;DgIuMHpLQ-Dz$Wbjr`sej)ppmRHoxcJ_U^fMwSI1p<u
zb5TkZP9=sh+gJ!3IjX0$#cb6@YNYzDf|<;53I`+k-?KE9T)Z!1Ay^I0z{+%zqJ1tf
z0Vp2yfi<Tv{B>f>PmX(f*4$uX8%ZgAs;jE3pdg50AQr*#ppTNsVss|r|9hQt#|@2t
z(vxi2|9||;#J0@+WbE{G4k_Zo{fy#d1gPL9wSSE*ud;qJ2WhmEc~A-q^0L+8w&S?d
z^UVZNu`7_|eRT_`zuyddy?3(Zd%bbNliFO;+9eK9h;oLp-KOt!nqI5f(nhMm6zJ2u
z->pkPtdZ<@>r<uQi{@2ANuV7a1ToptU>fJh41Y3U4~Sf0E-=ghM>r=7BRzu7v$5>)
zXF-t3%oL;AfC!dfm`tpw?;3qBFtnXx4UhmT$W+boMA~}2^YP`y<0K+>fh9%fr$&XO
z5i3%*ujWeE?RL6dztc1pPT>MEk&x5P*-{qAAVs9khs_2t(>lk?VS0vXl4rwEWenzr
z%75mF*+!R&4a5kT<#`g-R>f{qi@l*^eLmT`Lkv>Rh2KZW+dj`B<I=}qUU@zkpZkfp
z3{cQu$*RS7Ny4RJNw=kGDS3)w4@AHvgzq8W(&>4`Tbdt?bjyfa1bRTih3Sm02_J1b
z!ssUsqT<?9zr7fLU{@U!#p@4vop_%<-esK_*B->K*G%m1?Y>YQxoLFs#wFNIT@H8g
zo4Qk0+t@pHTF2h8(Z+&(#K};=o6=QsAA+mkuREXri9O;wk!Qdw`?tU+FS%deeEnf=
a<*z_qGw_;$*9^RT2EGC1N%+hF6aWBCoBm_~

diff --git a/docs/upgrades/packages-7.7.18/default-map-view.wgpkg b/docs/upgrades/packages-7.7.18/default-map-view.wgpkg
index eac4fc8e2fbc9e77610ec8502c51ccf054af96a3..4df1a3a0afcea4a87b8699373236c7108f9734f6 100644
GIT binary patch
literal 1217
zcmV;y1U~y8iwFP!00000|Ls<7PvbZc?&tj#R;88hBxuvLDcjPk1nhFaEzsrVxMRDj
z+{A4SshzVON)PehcWft3+5js~Ani#+f`G^K_RP#Psgz#-aU5sE^GYTCZZ^%^aT}!)
zT0BmvR&yKmdacoHI3-krd+-94*MDNEuz=8JWH^rL<Nn~<X!N*PCkKyBPQU*rkBPdL
z{q|b+@5+_r?1gdwi_Heq8{QAq-)n$yx&95e;g*o|LjIpL^IG+<Jn8kP5#GInAuKC0
zjY6!*04s(4$&@f9%czaMep@qgskp#nl0S+BkBCr|n2W}Yw&V)}c7pA>zFV%BjlLFy
zSgKFA5f>ocGCC{{!-W{eOBws+C?1AXPDqgHGBUfMEZ{R^)X4;L&Uhqg(Hyx|0`CzV
zoZ+$TVgDM;>3}*?%|n9JJR-mKA?;gL^`-2WyOr5^Kmw``an$3KDHP%%3GV_b0hoDv
z7;^u5^S*G4vM5$-g=1|P0}@4vBq8zD5ACJ~?q)PllQs<K`_21K)kNRT^5-)~#JMD5
z-=>$tdkKN3bMK2jE2LoZM|WDLX*vZ0StRuF{eyZI5md03X0%omSxo+euheFyYT<$f
z0(dQAEaHZxBr3tIb>$2$YghGy!1=O0{M*IX!{$G;4C7dY2EGZOlIj#k`e!{I7+DR-
z2*;sX*QYm><P@pgqd`EJ(XM3%sq6`^xb8tC%JuVD@HpBJK0zZIQLdh;M|0j$Fs}nT
zLXt>HIjh`YQNh8KvSZe@LO4M_XG-u;c01KXp{qgZB!F|~PcR$nNw^@x-_Q3e(EXJW
z_hWg?eo+%DD?CzQUVb(ISTz#tvw+-w1D|0`e%*xO(MJ2KV=p6f4mLrszK%{!!y}9$
zJyxBny_Bk$utLrw1o)Z3lZmKkFUu<_Uw7fUui(0|rPEeag(Nex;?hE)eVQxK9412h
zPl~ILnJz*O%VDe(X9MV)9biWyRx!<KZUuo!rKpV;lI4OdLI)H~Ah~W~6C$WO7vZkp
z(;l!2v%QgP8$+Hurj`#eFJ&Yl@3LL)+3$4SXa0O3YI%gGwl{5GwA)*HVA}1oWKU$*
zHLV}=fR1Rwur=3nHe9#aXl9p8K}_R*w9|s1(a@hu(~`8lIn+$Ok*QOuYk`NMjVU)u
z@|s3RT!D8V>qcFjCs<_hneK)kIM)EiW{Z?@1e@(9zkN)%ozj03?_MhxK!gRbud)6J
zRPFZO+2Q9Ra8!PVm6C4CrCms60@G?b`8pd}tF_T;c^hu77X-PXni4*y`}CoL00qHL
zOq(K?kDTz?KHKGDYSGAvVoB^GP1ovbbPSqCM%cGFL4~W!6;2r}zmC(Xc{Y!s7bh|F
zEdH`=v%*}f7BWi8F;;eH#sYXGp~Qrw4KtwyEg^d!xc*t3l-GI|A7$ZbF3N_GFkj3g
z)k~Wu*K!JvlU?fJlbuWV!aLsn<9PQp`f$)YSU>ra8KLrYE};)rTgNnQIt%%)Mi_nb
z&G^vpn@`Q<POpD(yt-R=GmkK!K$uB*LvcGDjPOx#`Io0ocs=r*aebU!UbJ`;pZ@l}
fe|P`We5}6(@`k`00&fVsAOhb3K~3g802BZK2lib*

literal 1087
zcmV-F1i<?riwFP!00000|Ls=oZyGlk=X3uG>ppGL0>{BYVJuS8HVtc%vV}BTONGpx
z0Vj9%&GrS@)c<{t?R$f~Op%(Yn_>wL{Ji@2JkQTpuRZ;8UAOD|wVHl*I_Bwm?OF{L
z%dIt=Ub_WquItxO6Ml4S2uz-SrBY!5sjbLtk<$C)f!ch2zgQm*mOY$){zsO{x><hv
zJ^Q<UB{};_X8@0#Hq;xQch$e$@w}b-x4l-UhTN|d|3NoTRsZ^fQNJ1CUoT(?9Yx|K
z!ir3>QaD(~gemEuKKk_e2P2n?3%nrJtwivI2t|oeG;Xw~KoIZ~9&WU*({hZx7DQO8
zH|vB8kRBKtmPSz_hVfFyzmuf1h{`1iOIt=(mz0HkWt_UDKyDaMB)#p9td+pW1czh1
zkRu#igF8rQD<oerA}%BmLnEsuyJddM5KBo^X4JcKryrYFt)D~pm&4ib9=@J+{#cb6
zrXn&)FL_KFF;4VnFNa$;LNdo`r1tdg4J8#rDvxOx5@xKMr9&!5f-9~ziG{0z#zOEk
z8HR5{s*F_y{XC-CA1J8yl+KYPQc}+9H(1nh7*qD1?OP%2pnx+acqI1+jm%(wA||Y`
z4lvW9Di*U;DbA*V&MW93A|9|j2*VMl><(*ONVdaD5|Kb5sWuV$Y2wTyj#VECx>%|o
zCl2B)SYo!&qDwM+doiq^;-o(3K`P&~@6?jYI!_dwR(>*ntUD48SxDBO0fHzc--9D_
z#)%qOWn}ijCkXcT(7DY4qeSOEXjrA(#Gn*$o**cvIi1WzxBZncXWg`4gq|o+H@<Wg
z6jc!^-Ry+45b2mkWzew4vVRI6kdE1@bP-z;LDhwbjs%ZKSU|l@Z&cdJjN~f=>Rt0p
z8ObQYu~$a<onInlya2{up5fT`tSwN#f1n4c-ydh}Q>tsSIOQRoQ#-d#)AQY~=X$<Z
zDj8%<(y#3lA*eX|ur)>5NSIAcNZrz$O5MG97TKICBPOqDa>f-z53uf-U0{G7)3Gkg
zKLpnRriPmwoB&_mR5{I*{ha=pMfY64OfA6zXvuiL2daMmczk+t8#pRYxF$Qxzgu)i
zWd_skajJDTvR<#->-hk8nUNqjR8z(4oTcw72v8F+ZQc}BK$m<qWJg@Y7LAH1mBi9>
zPS(5GF=!f@;K1Sp6>e--IA^w!<eh?{9?frs<)gT*YV{~yLxX>d)X<~&%pPcm$#y+h
zB~4Kk1}ir$Zxs}o-64jlP(f3u)YlwU_8Vb=*d%I{H&dk*6<%a_Z+x_BuY+z%-d+aN
z4|q8~c^4fnN+(pFZzS}`ZcCYF&S#{0?E@v4H<Y_b!MxaPPeALX>$kjCg_2-!fk?CT
zW?~&r=lCrA_?xeO<*meb7p+QqMeAqz={Kz}FTQ*;uZGWwJR|Uo!2cY9zX4Q8;?e*T
F0057p2vz_9

diff --git a/lib/WebGUI/Asset/MapPoint.pm b/lib/WebGUI/Asset/MapPoint.pm
index 320f282ad..55e105148 100644
--- a/lib/WebGUI/Asset/MapPoint.pm
+++ b/lib/WebGUI/Asset/MapPoint.pm
@@ -296,6 +296,10 @@ sub getTemplateVarsEditForm {
         ;
     $var->{ form_footer } = WebGUI::Form::formFooter( $session );
 
+    $var->{ form_save } = WebGUI::Form::submit( $session, {
+        name        => "save",
+    } );
+
     # Stuff from this class's definition
     my $definition  = __PACKAGE__->definition($session)->[0]->{properties};
     for my $key ( keys %{$definition} ) {
diff --git a/lib/WebGUI/Asset/Wobject/Map.pm b/lib/WebGUI/Asset/Wobject/Map.pm
index daee44034..2b590d662 100644
--- a/lib/WebGUI/Asset/Wobject/Map.pm
+++ b/lib/WebGUI/Asset/Wobject/Map.pm
@@ -16,6 +16,7 @@ use strict;
 use Tie::IxHash;
 use WebGUI::International;
 use WebGUI::Utility;
+use HTML::Entities qw(encode_entities);
 use base 'WebGUI::Asset::Wobject';
 
 # To get an installer for your wobject, add the Installable AssetAspect
@@ -520,6 +521,8 @@ sub www_ajaxEditPointSave {
     my $form        = $self->session->form;
     my $i18n        = WebGUI::International->new( $session, 'Asset_Map' );
 
+    # We're returning as HTML because application/json causes download pop-up
+    # and text/plain causes <pre>...</pre> in firefox
     $session->http->setMimeType("text/html"); 
     $session->log->preventDebugOutput;
 
@@ -547,7 +550,8 @@ sub www_ajaxEditPointSave {
         $asset->requestAutoCommit;
     }
 
-    return JSON->new->encode($asset->getMapInfo);
+    # Encode entities because we're returning as HTML
+    return encode_entities( JSON->new->encode($asset->getMapInfo) );
 }
 
 #-------------------------------------------------------------------
diff --git a/www/extras/yui-webgui/build/map/map.js b/www/extras/yui-webgui/build/map/map.js
index 8570b2f67..f9149e649 100644
--- a/www/extras/yui-webgui/build/map/map.js
+++ b/www/extras/yui-webgui/build/map/map.js
@@ -51,8 +51,15 @@ WebGUI.Map.editPoint
 
     // Callback should open the window with the form
     var callback    = function (text, code) {
-        marker.openInfoWindowHtml( text );
-
+        marker.infoWin.innerHTML = text;
+        var button = marker.infoWin.getElementsByTagName( "form" )[0].elements["save"];
+        marker.openInfoWindow( marker.infoWin );
+        YAHOO.util.Event.addListener( button, "click", function (e) {
+            // Closing the info window triggers infowindowbeforeclose
+            marker.closeInfoWindow();
+            YAHOO.util.Event.stopEvent(e);
+            return false;
+        } );
         GEvent.addListener( marker, "infowindowbeforeclose", function () {
             WebGUI.Map.editPointSave( map, mgr, mapUrl, marker );
         });
@@ -86,9 +93,11 @@ WebGUI.Map.editPointSave
             GEvent.clearListeners( marker, "click" );
             GEvent.clearListeners( marker, "infowindowbeforeclose" );
 
-            // Set the marker's title
-            marker.kh.title = point.title;
-            // I hate the google maps API.
+            // Decode HTML entities because JSON is being returned as text/html
+            // See WebGUI::Asset::Wobject::Map www_ajaxEditPointSave
+            var decoder = document.createElement( "textarea" );
+            decoder.innerHTML       = point.content;
+            point.content           = decoder.value;
 
             var infoWin = document.createElement( "div" );
             infoWin.innerHTML       = point.content;