You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2007/09/02 00:18:39 UTC
svn commit: r571888 - in
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket:
ajax/AjaxRequestTarget.java ajax/wicket-ajax.js
markup/html/IHeaderResponse.java markup/html/internal/HeaderResponse.java
Author: knopp
Date: Sat Sep 1 15:18:37 2007
New Revision: 571888
URL: http://svn.apache.org/viewvc?rev=571888&view=rev
Log:
WICKET-771
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=571888&r1=571887&r2=571888&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Sat Sep 1 15:18:37 2007
@@ -805,10 +805,22 @@
super.renderJavascriptReference(reference);
}
+ public void renderJavascriptReference(ResourceReference reference, String id)
+ {
+ checkHeaderRendering();
+ super.renderJavascriptReference(reference, id);
+ }
+
public void renderJavascriptReference(String url)
{
checkHeaderRendering();
super.renderJavascriptReference(url);
+ }
+
+ public void renderJavascriptReference(String url, String id)
+ {
+ checkHeaderRendering();
+ super.renderJavascriptReference(url, id);
}
public void renderString(CharSequence string)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=571888&r1=571887&r2=571888&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js Sat Sep 1 15:18:37 2007
@@ -1351,7 +1351,7 @@
// Adds a javascript element to page header.
// The fakeSrc attribute is used to filter out duplicate javascript references.
// External javascripts are loaded using xmlhttprequest. Then a javascript element is created and the
-// javascript body is used as text for the element. Fori javascript references, wicket uses the src
+// javascript body is used as text for the element. For javascript references, wicket uses the src
// attribute to filter out duplicates. However, since we set the body of the element, we can't assign
// also a src value. Therefore we put the url to the src_ (notice the underscore) attribute.
// Wicket.Head.containsElement is aware of that and takes also the underscored attributes into account.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java?rev=571888&r1=571887&r2=571888&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java Sat Sep 1 15:18:37 2007
@@ -40,10 +40,33 @@
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
*
+ * @param reference
+ * resource reference pointing to the javascript resource
+ * @param id
+ * id that will be used to filter duplicate reference (it's still filtered by URL
+ * too)
+ */
+ public void renderJavascriptReference(ResourceReference reference, String id);
+
+ /**
+ * Writes a javascript reference, if the specified reference hasn't been rendered yet.
+ *
* @param url
* url of the the javascript resource
*/
public void renderJavascriptReference(String url);
+
+ /**
+ * Writes a javascript reference, if the specified reference hasn't been rendered yet.
+ *
+ * @param url
+ * url of the the javascript resource
+ * @param id
+ * id that will be used to filter duplicate reference (it's still filtered by URL
+ * too)
+ */
+ public void renderJavascriptReference(String url, String id);
+
/**
* Renders javascript code to the response, if the javascript has not already been rendered.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=571888&r1=571887&r2=571888&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Sat Sep 1 15:18:37 2007
@@ -123,6 +123,16 @@
}
/**
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(org.apache.wicket.ResourceReference,
+ * java.lang.String)
+ */
+ public void renderJavascriptReference(ResourceReference reference, String id)
+ {
+ CharSequence url = RequestCycle.get().urlFor(reference);
+ renderJavascriptReference(url.toString(), id);
+ }
+
+ /**
* @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(java.lang.String)
*/
public void renderJavascriptReference(String url)
@@ -135,6 +145,21 @@
}
}
+ /**
+ * @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascriptReference(java.lang.String,
+ * java.lang.String)
+ */
+ public void renderJavascriptReference(String url, String id)
+ {
+ List token1 = Arrays.asList(new Object[] { "javascript", url });
+ List token2 = Arrays.asList(new Object[] { "javascript", id });
+ if (wasRendered(token1) == false && wasRendered(token2))
+ {
+ JavascriptUtils.writeJavascriptUrl(getResponse(), url, id);
+ markRendered(token1);
+ markRendered(token2);
+ }
+ }
/**
* @see org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(java.lang.CharSequence,