[richfaces-svn-commits] JBoss Rich Faces SVN: r543 - in trunk/richfaces/gmap/src/main: resources/org/richfaces/renderkit/html/script and 1 other directories.
Author: SergeySmirnov
Date: 2007-04-24 16:38:50 -0400 (Tue, 24 Apr 2007)
New Revision: 543
Modified:
trunk/richfaces/gmap/src/main/config/component/gmap.xml
trunk/richfaces/gmap/src/main/resources/org/richfaces/renderkit/html/script/gmap.js
trunk/richfaces/gmap/src/main/templates/gmap.jspx
Log:
added oninit attribute
Modified: trunk/richfaces/gmap/src/main/config/component/gmap.xml
===================================================================
--- trunk/richfaces/gmap/src/main/config/component/gmap.xml 2007-04-24 18:30:12 UTC (rev
542)
+++ trunk/richfaces/gmap/src/main/config/component/gmap.xml 2007-04-24 20:38:50 UTC (rev
543)
@@ -36,6 +36,14 @@
<defaultvalue>"internal"</defaultvalue>
</property>
<property>
+ <name>oninit</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Javascript code invoked just after the Google Map object is initiated.
+ </description>
+ <defaultvalue>""</defaultvalue>
+ </property>
+ <property>
<name>gmapVar</name>
<classname>java.lang.String</classname>
<description>
Modified:
trunk/richfaces/gmap/src/main/resources/org/richfaces/renderkit/html/script/gmap.js
===================================================================
---
trunk/richfaces/gmap/src/main/resources/org/richfaces/renderkit/html/script/gmap.js 2007-04-24
18:30:12 UTC (rev 542)
+++
trunk/richfaces/gmap/src/main/resources/org/richfaces/renderkit/html/script/gmap.js 2007-04-24
20:38:50 UTC (rev 543)
@@ -1,18 +1,11 @@
+
function __addLoadEvent(func) {
- var oldonload = window.onload;
- if (typeof window.onload != 'function') {
- window.onload = func;
- } else {
- window.onload = function() {
- if (oldonload) {
- oldonload();
- }
- func();
- }
- }
+Event.observe(window, "load", func );
}
+
+
function __initGmapdiv(mapVar, clid,warningMessage ) {
var mapdiv = document.getElementById(clid);
if (GBrowserIsCompatible()) {
Modified: trunk/richfaces/gmap/src/main/templates/gmap.jspx
===================================================================
--- trunk/richfaces/gmap/src/main/templates/gmap.jspx 2007-04-24 18:30:12 UTC (rev 542)
+++ trunk/richfaces/gmap/src/main/templates/gmap.jspx 2007-04-24 20:38:50 UTC (rev 543)
@@ -17,6 +17,7 @@
<c:set var="lat"
value="#{component.attributes['lat']}"/>
<c:set var="lng"
value="#{component.attributes['lng']}"/>
<c:set var="mapType"
value="#{component.attributes['mapType']}"/>
+ <c:set var="oninit"
value="#{component.attributes['oninit']}"/>
<c:set var="warningMessage"
value="#{component.attributes['warningMessage']}"/>
<c:set var="isGScale"
value="#{component.attributes['showGScaleControl']}"/>
<c:set var="isGMapType"
value="#{component.attributes['showGMapTypeControl']}"/>
@@ -25,8 +26,8 @@
<c:set var="enableInfoWindow"
value="#{component.attributes['enableInfoWindow']}"/>
<c:set var="enableDoubleClickZoom"
value="#{component.attributes['enableDoubleClickZoom']}"/>
<c:set var="enableContinuousZoom"
value="#{component.attributes['enableContinuousZoom']}"/>
- <h:styles>css/gmap.xcss</h:styles>
- <h:scripts>script/gmap.js</h:scripts>
+ <h:styles>css/gmap.xcss</h:styles>
+ <h:scripts>new
org.ajax4jsf.framework.resource.PrototypeScript(),script/gmap.js</h:scripts>
<div id="#{clientId}" class="dr-gmap rich-gmap
#{component.attributes['styleClass']}"
x:passThruWithExclusions="id, styleClass"
@@ -40,6 +41,7 @@
function applyGmapparam_#{map}() {
__applyGmapparam("#{map}",#{lat},
#{lng},#{zoom},#{mapType},#{enableDragging},#{enableInfoWindow},#{enableDoubleClickZoom},#{enableContinuousZoom},#{isGMapType},#{isGScale},#{isGLarge});
}__addLoadEvent(initGMap_#{map});__addLoadEvent(applyGmapparam_#{map});
+var func = new Function('event', '#{oninit}'); __addLoadEvent(func);
//]]>
</script>
</div>