You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/08/04 02:31:26 UTC
svn commit: r562630 - in
/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui:
YuiLib.java calendar/DatePicker.java
Author: ehillenius
Date: Fri Aug 3 17:31:25 2007
New Revision: 562630
URL: http://svn.apache.org/viewvc?view=rev&rev=562630
Log:
it is better to just include the yahoo-min.js dependency directly instead of setting the global base dir for YUI (which could interfere with users trying to use the YUI loader for their own purposes).
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java?view=diff&rev=562630&r1=562629&r2=562630
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java Fri Aug 3 17:31:25 2007
@@ -36,18 +36,12 @@
*
* @param response
* header response
- * @param configureBasePath
- * whether to globally configure YUI's base path to be relative
- * to this directory
*/
// TODO see http://tech.groups.yahoo.com/group/ydn-javascript/message/16209
- public static void load(IHeaderResponse response, boolean configureBasePath)
+ public static void load(IHeaderResponse response)
{
- if (configureBasePath)
- {
- response.renderJavascript("YAHOO_config = { load: { base: 'resources/"
- + YuiLib.class.getName() + "/'} } ", "YAHOO_config");
- }
+ response.renderJavascriptReference(new JavascriptResourceReference(YuiLib.class,
+ "yahoo/yahoo-min.js"));
response.renderJavascriptReference(new JavascriptResourceReference(YuiLib.class,
"yuiloader-beta.js"));
}
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?view=diff&rev=562630&r1=562629&r2=562630
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Fri Aug 3 17:31:25 2007
@@ -147,7 +147,7 @@
*/
public void renderHead(IHeaderResponse response)
{
- YuiLib.load(response, getConfigureYUIBasePath());
+ YuiLib.load(response);
// variables for the initialization script
Map variables = new HashMap();