From richfaces-svn-commits at lists.jboss.org Thu Aug  2 09:16:22 2007
Content-Type: multipart/mixed; boundary="===============2380720160752382383=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r2005 - in
 trunk/ui/gmap/src/main: templates and 1 other directory.
Date: Thu, 02 Aug 2007 09:16:22 -0400
Message-ID: <E1IGaXO-0000tN-4E@committer01.frg.pub.inap.atl.jboss.com>

--===============2380720160752382383==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: A.Skokov
Date: 2007-08-02 09:16:21 -0400 (Thu, 02 Aug 2007)
New Revision: 2005

Modified:
   trunk/ui/gmap/src/main/resources/org/richfaces/renderkit/html/script/gma=
p.js
   trunk/ui/gmap/src/main/templates/gmap.jspx
Log:
http://jira.jboss.com/jira/browse/RF-530

Modified: trunk/ui/gmap/src/main/resources/org/richfaces/renderkit/html/scr=
ipt/gmap.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/gmap/src/main/resources/org/richfaces/renderkit/html/script/gm=
ap.js	2007-08-02 11:52:49 UTC (rev 2004)
+++ trunk/ui/gmap/src/main/resources/org/richfaces/renderkit/html/script/gm=
ap.js	2007-08-02 13:16:21 UTC (rev 2005)
@@ -1,11 +1,11 @@
 =

 function __addLoadEvent(func) {
-Event.observe(window, "load", func ); =

+Event.observe(window, "load", func );
 }
+function __addUnLoadEvent(func) {
+Event.observe(window, "unload", func );
+}
 =

-
-
-
 function __initGmapdiv(mapVar, clid,warningMessage ) {
 var mapdiv =3D document.getElementById(clid);
 if (GBrowserIsCompatible()) {
@@ -23,7 +23,7 @@
 =

 window[gmapVar].setCenter(new GLatLng(lat, lng), zoom, mapType);
 =

-if (enableDragging) 	=

+if (enableDragging)
  window[gmapVar].enableDragging();
 else
  window[gmapVar].disableDragging();

Modified: trunk/ui/gmap/src/main/templates/gmap.jspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/gmap/src/main/templates/gmap.jspx	2007-08-02 11:52:49 UTC (rev=
 2004)
+++ trunk/ui/gmap/src/main/templates/gmap.jspx	2007-08-02 13:16:21 UTC (rev=
 2005)
@@ -1,7 +1,7 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<f:root =

-	xmlns:f=3D"http://ajax4jsf.org/cdk/template" =

-	xmlns:c=3D" http://java.sun.com/jsf/core" =

+<f:root
+	xmlns:f=3D"http://ajax4jsf.org/cdk/template"
+	xmlns:c=3D" http://java.sun.com/jsf/core"
 	xmlns:ui=3D" http://ajax4jsf.org/cdk/ui"
 	xmlns:u=3D" http://ajax4jsf.org/cdk/u"
 	xmlns:x=3D" http://ajax4jsf.org/cdk/x"
@@ -9,8 +9,8 @@
 	baseclass=3D"org.ajax4jsf.renderkit.HeaderResourcesRendererBase"
 	component=3D"org.richfaces.component.UIGmap">
 	<f:clientid var=3D"clientId"/>
-	=

 =

+
 	<c:set var=3D"key" value=3D"#{component.attributes['gmapKey']}"/>
 	<c:set var=3D"zoom" value=3D"#{component.attributes['zoom']}"/>
 	<c:set var=3D"map" value=3D"#{component.attributes['gmapVar']}"/>
@@ -33,12 +33,12 @@
 			x:passThruWithExclusions=3D"id, styleClass"
 >
 <script type=3D"text/javascript"  src=3D"http://maps.google.com/maps?file=
=3Dapi&amp;v=3D2&amp;key=3D#{key}" />
-<script type=3D"text/javascript"> =

+<script type=3D"text/javascript">
  //<![CDATA[
 =

 function __initGMap() { __initGmapdiv("#{map}","#{clientId}", "#{warningMe=
ssage}");
  __applyGmapparam("#{map}",#{lat}, #{lng},#{zoom},#{mapType},#{enableDragg=
ing},#{enableInfoWindow},#{enableDoubleClickZoom},#{enableContinuousZoom},#=
{isGMapType},#{isGScale},#{isGLarge});
- var userfunc =3D new Function('event', '#{oninit}'); userfunc();};__addLo=
adEvent(__initGMap);
+ var userfunc =3D new Function('event', '#{oninit}'); userfunc();};__addLo=
adEvent(__initGMap);__addUnLoadEvent(GUnload); =

 //]]>
 </script>
 </div>


--===============2380720160752382383==--