Author: woonsan
Date: Thu Apr 16 14:30:11 2009
New Revision: 765651
URL: http://svn.apache.org/viewvc?rev=765651&view=rev
Log:
Adding ID and mergeHint argument in the DojoPortletHelper and changes in
portlets using this helper.
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoPortletHelper.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/googlemaps/GoogleMapsPortlet.java
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoPortletHelper.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoPortletHelper.java?rev=765651&r1=765650&r2=765651&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoPortletHelper.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoPortletHelper.java
Thu Apr 16 14:30:11 2009
@@ -58,6 +58,16 @@
public static void contributeScript(RenderResponse response, String
language, String type, String src, String textContent)
{
+ contributeScript(response, language, type, src, textContent, null);
+ }
+
+ public static void contributeScript(RenderResponse response, String
language, String type, String src, String textContent, String id)
+ {
+ contributeScript(response, language, type, src, textContent, id, null);
+ }
+
+ public static void contributeScript(RenderResponse response, String
language, String type, String src, String textContent, String id, String
mergeHint)
+ {
Element headElem = response.createElement("script");
if (language != null)
@@ -80,27 +90,28 @@
headElem.appendChild(headElem.getOwnerDocument().createTextNode(textContent));
}
+ if (id != null)
+ {
+ headElem.setAttribute("id", id);
+ }
+
+ if (mergeHint != null)
+ {
+
headElem.setAttribute(HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_ATTRIBUTE,
mergeHint);
+ }
+
response.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, headElem);
}
public static void enableDojo(RenderResponse response, String dojoJsUrl)
{
- Element headElem = response.createElement("script");
- headElem.setAttribute("language", "JavaScript");
- headElem.setAttribute("type", "text/javascript");
- headElem.setAttribute("src", dojoJsUrl == null ? "" : dojoJsUrl);
- headElem.setAttribute(HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_ATTRIBUTE,
HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_JS_INCLUDE);
- response.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, headElem);
+ contributeScript(response, "JavaScript", "text/javascript", dojoJsUrl
== null ? "" : dojoJsUrl, null, null,
HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_JS_INCLUDE);
}
public static void contributeDojoRequire(RenderResponse response, String
dojoRequire)
{
- Element headElem = response.createElement("script");
- headElem.setAttribute("language", "JavaScript");
- headElem.setAttribute("type", "text/javascript");
- headElem.setAttribute(HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_ATTRIBUTE,
HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_REQUIRE);
-
headElem.appendChild(headElem.getOwnerDocument().createTextNode("dojo.require(\""
+ dojoRequire + "\");"));
- response.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, headElem);
+ String requireStatement = "dojo.require(\"" + dojoRequire + "\");";
+ contributeScript(response, "JavaScript", "text/javascript", null,
requireStatement, null, HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_REQUIRE);
}
public static void contributeDojoRequires(RenderResponse response, String
dojoRequires)
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java?rev=765651&r1=765650&r2=765651&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
Thu Apr 16 14:30:11 2009
@@ -166,7 +166,7 @@
{
if ((textContent != null && textContent.length() > 0) || (src != null
&& src.length() > 0))
{
- DojoPortletHelper.contributeScript(response, "JavaScript",
"text/javascript", src, textContent);
+ DojoPortletHelper.contributeScript(response, "JavaScript",
"text/javascript", src, textContent, null, null);
return true ;
}
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java?rev=765651&r1=765650&r2=765651&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/flash/FlashPortlet.java
Thu Apr 16 14:30:11 2009
@@ -116,7 +116,7 @@
defaultSwfObjectsLibUrl = param;
}
- param = config.getInitParameter(EXPRESS_INSTALL_URL);
+ param = config.getInitParameter(PARAM_EXPRESS_INSTALL_URL);
if (param != null && !"".equals(param))
{
defaultSwfExpressInstallUrl = param;
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/googlemaps/GoogleMapsPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/googlemaps/GoogleMapsPortlet.java?rev=765651&r1=765650&r2=765651&view=diff
==============================================================================
---
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/googlemaps/GoogleMapsPortlet.java
(original)
+++
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/googlemaps/GoogleMapsPortlet.java
Thu Apr 16 14:30:11 2009
@@ -89,11 +89,11 @@
String loadMapsCallback = namespace + "loadMaps";
String loadMapsCallbackBody =
MessageFormat.format(LOAD_MAPS_JS_FUNCTION_BODY, namespace);
- DojoPortletHelper.contributeScript(response, "JavaScript",
"text/javascript", null, loadMapsCallbackBody);
+ DojoPortletHelper.contributeScript(response, "JavaScript",
"text/javascript", null, loadMapsCallbackBody, null, null);
String apiKey = request.getPreferences().getValue("APIKey", "");
String googleMapsSourceUrl = "http://www.google.com/jsapi?key="; +
apiKey + "&callback=" + loadMapsCallback;
- DojoPortletHelper.contributeScript(response, "JavaScript",
"text/javascript", googleMapsSourceUrl, null);
+ DojoPortletHelper.contributeScript(response, "JavaScript",
"text/javascript", googleMapsSourceUrl, null, null, null);
DojoPortletHelper.contributeDojoRequire(response, "dojo.lang.*");
DojoPortletHelper.contributeDojoRequire(response, "dojo.event.*");
