Author: woonsan
Date: Mon Apr 20 11:30:16 2009
New Revision: 766658
URL: http://svn.apache.org/viewvc?rev=766658&view=rev
Log:
JS2-961: Constant name change because dojo library inclusion should be unique
and so it should be dependent on ID attribute.
Modified:
portals/applications/gems/trunk/src/main/java/org/apache/portals/gems/dojo/DojoPortletHelper.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=766658&r1=766657&r2=766658&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
Mon Apr 20 11:30:16 2009
@@ -44,14 +44,13 @@
/**
* An attribute value for key hint which can be used in head elements
merging by portal.
*/
- public static final String
HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_JS_INCLUDE = "dojo.js.include";
-
- /**
- * An attribute value for key hint which can be used in head elements
merging by portal.
- */
public static final String
HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_REQUIRE = "dojo.require";
-
+ /**
+ * An ID attribute value which can be used in head elements merging by
portal.
+ */
+ public static final String
HEAD_ELEMENT_CONTRIBUTION_ELEMENT_ID_DOJO_LIBRARY_INCLUDE =
"dojo.library.include";
+
private DojoPortletHelper()
{
}
@@ -105,7 +104,7 @@
public static void enableDojo(RenderResponse response, String dojoJsUrl)
{
- contributeScript(response, "JavaScript", "text/javascript", dojoJsUrl
== null ? "" : dojoJsUrl, null, null,
HEAD_ELEMENT_CONTRIBUTION_MERGE_HINT_KEY_DOJO_JS_INCLUDE);
+ contributeScript(response, "JavaScript", "text/javascript", dojoJsUrl
== null ? "" : dojoJsUrl, null,
HEAD_ELEMENT_CONTRIBUTION_ELEMENT_ID_DOJO_LIBRARY_INCLUDE, null);
}
public static void contributeDojoRequire(RenderResponse response, String
dojoRequire)
