Author: mgrigorov
Date: Thu Nov 24 14:56:25 2011
New Revision: 1205859
URL: http://svn.apache.org/viewvc?rev=1205859&view=rev
Log:
WICKET-4245 AbstractResourceAggregatingHeaderResponse forgets some information
about references
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java?rev=1205859&r1=1205858&r2=1205859&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/aggregation/AbstractResourceAggregatingHeaderResponse.java
Thu Nov 24 14:56:25 2011
@@ -323,7 +323,7 @@ public abstract class AbstractResourceAg
@Override
public void renderJavaScriptReference(String url, String id, boolean
defer)
{
- topLevelReferences.add(new ResourceReferenceAndStringData(null,
null, url, null,
+ topLevelReferences.add(new ResourceReferenceAndStringData(null,
null, url, id,
ResourceType.JS, defer, null, null));
}
@@ -358,8 +358,8 @@ public abstract class AbstractResourceAg
public void renderCSSReference(ResourceReference reference,
PageParameters pageParameters,
String media, String condition)
{
- topLevelReferences.add(new
ResourceReferenceAndStringData(reference, null, null, media,
- ResourceType.CSS, false, null, condition));
+ topLevelReferences.add(new
ResourceReferenceAndStringData(reference, pageParameters, null,
+ media, ResourceType.CSS, false, null, condition));
}
@Override