Arthur Bogaart pushed to branch bugfix/ESSENTIALS-1017 at cms-community /
hippo-essentials
Commits:
93502748 by Arthur Bogaart at 2016-08-12T13:48:30+02:00
ESSENTIALS-1017 Indent with four spaces
- - - - -
e41622ba by Arthur Bogaart at 2016-08-12T13:49:25+02:00
ESSENTIALS-1017 Indent with four spaces
- - - - -
6e3b48d3 by Arthur Bogaart at 2016-08-12T13:57:05+02:00
ESSENTIALS-1017 Align googlemaps JSP with Freemarker template
- - - - -
2 changed files:
- plugins/google-maps/src/main/resources/freemarker/essentials-googlemaps.ftl
- plugins/google-maps/src/main/resources/jsp/essentials-googlemaps.jsp
Changes:
=====================================
plugins/google-maps/src/main/resources/freemarker/essentials-googlemaps.ftl
=====================================
---
a/plugins/google-maps/src/main/resources/freemarker/essentials-googlemaps.ftl
+++
b/plugins/google-maps/src/main/resources/freemarker/essentials-googlemaps.ftl
@@ -6,13 +6,13 @@
<div id="map-canvas-${componentId}" style="width: ${cparam.width}px; height:
${cparam.height}px;"></div>
<@hst.headContribution category="htmlBodyEnd">
- <script type="text/javascript">
- if (!window.HEGM) {
- window.HEGM = [];
- }
- window.HEGM.push(function() {
- initGoogleMap('map-canvas-${componentId}', '${cparam.address?html}',
${cparam.longitude}, ${cparam.latitude}, ${cparam.zoomFactor},
'${cparam.mapType}');
- });
+ <script type="text/javascript">
+ if (!window.HEGM) {
+ window.HEGM = [];
+ }
+ window.HEGM.push(function() {
+ initGoogleMap('map-canvas-${componentId}',
'${cparam.address?html}', ${cparam.longitude}, ${cparam.latitude},
${cparam.zoomFactor}, '${cparam.mapType}');
+ });
</script>
</@hst.headContribution>
=====================================
plugins/google-maps/src/main/resources/jsp/essentials-googlemaps.jsp
=====================================
--- a/plugins/google-maps/src/main/resources/jsp/essentials-googlemaps.jsp
+++ b/plugins/google-maps/src/main/resources/jsp/essentials-googlemaps.jsp
@@ -1,34 +1,42 @@
<%@ include file="/WEB-INF/jsp/include/imports.jsp" %>
+<%--@elvariable id="componentId" type="java.lang.String"--%>
<%--@elvariable id="cparam"
type="org.onehippo.cms7.essentials.components.info.EssentialsGoogleMapsComponentInfo"--%>
-<c:choose>
- <c:when test="${not empty requestScope.cparam.apiKey}">
- <c:set
var="mapsUrl">https://maps.googleapis.com/maps/api/js?key=${fn:escapeXml(requestScope.cparam.apiKey)}</c:set>
- </c:when>
- <c:otherwise>
- <c:set var="mapsUrl">https://maps.googleapis.com/maps/api/js</c:set>
- </c:otherwise>
-</c:choose>
-<hst:headContribution keyHint="api" category="htmlHead">
- <script type="text/javascript" src="${mapsUrl}"></script>
+<div id="map-canvas-${componentId}" style="width:
${requestScope.cparam.width}px; height: ${requestScope.cparam.height}px;"></div>
+
+<hst:headContribution category="htmlBodyEnd">
+ <script type="text/javascript">
+ if (!window.HEGM) {
+ window.HEGM = [];
+ }
+ window.HEGM.push(function() {
+ initGoogleMap('map-canvas-${componentId}',
'${fn:escapeXml(requestScope.cparam.address)}',
${requestScope.cparam.longitude}, ${requestScope.cparam.latitude},
${requestScope.cparam.zoomFactor}, '${requestScope.cparam.mapType}');
+ });
+ </script>
</hst:headContribution>
-<hst:headContribution keyHint="maps" category="htmlHead">
- <hst:webfile path="/js/essentials-google-maps.js" var="customMapsJSUrl" />
- <script type="text/javascript" src="${customMapsJSUrl}"></script>
+<hst:headContribution keyHint="essentials-google-maps" category="htmlBodyEnd">
+ <hst:webfile path="/js/essentials-google-maps.js"
var="essentialsGoogleMapsJs" />
+ <script type="text/javascript" src="${essentialsGoogleMapsJs}"></script>
</hst:headContribution>
-<hst:headContribution keyHint="initializeGoogleMaps" category="htmlBodyEnd">
- <script type="text/javascript">
- initializeGoogleMaps("${fn:escapeXml(requestScope.cparam.address)}",
${requestScope.cparam.longitude}, ${requestScope.cparam.latitude},
${requestScope.cparam.zoomFactor}, "${requestScope.cparam.mapType}");
- </script>
+<hst:headContribution keyHint="google-maps-api" category="htmlBodyEnd">
+ <c:choose>
+ <c:when test="${not empty requestScope.cparam.apiKey}">
+ <c:set
var="mapsUrl">https://maps.googleapis.com/maps/api/js?key=${fn:escapeXml(requestScope.cparam.apiKey)}&callback=initGoogleMaps</c:set>
+ </c:when>
+ <c:otherwise>
+ <c:set
var="mapsUrl">https://maps.googleapis.com/maps/api/js?callback=initGoogleMaps</c:set>
+ </c:otherwise>
+ </c:choose>
+ <script type="text/javascript" src="${mapsUrl}" async="async"
defer="defer"></script>
</hst:headContribution>
-<c:if test="${requestScope.cmsrequest}">
- <script type="text/javascript">
- initializeGoogleMaps("${fn:escapeXml(requestScope.cparam.address)}",
${requestScope.cparam.longitude}, ${requestScope.cparam.latitude},
${requestScope.cparam.zoomFactor}, "${requestScope.cparam.mapType}");
- </script>
+<c:if test="${editMode}">
+ <script type="text/javascript">
+ if (window.initGoogleMap) {
+ initGoogleMap('map-canvas-${componentId}',
'${fn:escapeXml(requestScope.cparam.address)}',
${requestScope.cparam.longitude}, ${requestScope.cparam.latitude},
${requestScope.cparam.zoomFactor}, '${requestScope.cparam.mapType}');
+ }
+ </script>
</c:if>
-
-<div id="map-canvas" style="width: ${requestScope.cparam.width}px; height:
${requestScope.cparam.height}px;"></div>
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/9aaf9e9d639b15171b6b3935ed681eedd961e551...6e3b48d355599989490b1fcc2fc9d7dba4f5bb8e
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
