You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/02/05 19:56:13 UTC
svn commit: r907051 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/services/javascript/JavascriptSupportImpl.java
test/java/org/apache/tapestry5/internal/services/javascript/JavaScriptSupportImplTest.java
Author: hlship
Date: Fri Feb 5 18:56:13 2010
New Revision: 907051
URL: http://svn.apache.org/viewvc?rev=907051&view=rev
Log:
Differentiate some JavascriptSupport behavior based on full vs. partial render
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/javascript/JavaScriptSupportImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptSupportImpl.java?rev=907051&r1=907050&r2=907051&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/JavascriptSupportImpl.java Fri Feb 5 18:56:13 2010
@@ -36,7 +36,9 @@
private final ClientInfrastructure clientInfrastructure;
- private boolean stackAssetsAdded;
+ private final boolean partialMode;
+
+ private boolean stackAssetsAdded;;
private final Map<InitializationPriority, StringBuilder> scripts = CollectionFactory.newMap();
@@ -44,15 +46,20 @@
public JavascriptSupportImpl(DocumentLinker linker, ClientInfrastructure clientInfrastructure)
{
- this(linker, clientInfrastructure, new IdAllocator());
+ this(linker, clientInfrastructure, new IdAllocator(), false);
}
public JavascriptSupportImpl(DocumentLinker linker, ClientInfrastructure clientInfrastructure,
- IdAllocator idAllocator)
+ IdAllocator idAllocator, boolean partialMode)
{
this.linker = linker;
this.clientInfrastructure = clientInfrastructure;
this.idAllocator = idAllocator;
+ this.partialMode = partialMode;
+
+ // In partial mode, assume that the infrastructure stack is already present
+ // (from the original page render).
+ stackAssetsAdded = partialMode;
}
public void commit()
@@ -85,13 +92,15 @@
if (scripts.containsKey(InitializationPriority.EARLY) || scripts.containsKey(InitializationPriority.NORMAL)
|| scripts.containsKey(InitializationPriority.LATE))
{
- master.append("Tapestry.onDOMLoaded(function() {\n");
+ if (!partialMode)
+ master.append("Tapestry.onDOMLoaded(function() {\n");
addIfNonNull(master, InitializationPriority.EARLY);
addIfNonNull(master, InitializationPriority.NORMAL);
addIfNonNull(master, InitializationPriority.LATE);
- master.append("});");
+ if (!partialMode)
+ master.append("});");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/javascript/JavaScriptSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/javascript/JavaScriptSupportImplTest.java?rev=907051&r1=907050&r2=907051&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/javascript/JavaScriptSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/javascript/JavaScriptSupportImplTest.java Fri Feb 5 18:56:13 2010
@@ -21,6 +21,7 @@
import org.apache.tapestry5.internal.services.DocumentLinker;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.ClientInfrastructure;
import org.apache.tapestry5.services.javascript.InitializationPriority;
@@ -63,6 +64,25 @@
}
@Test
+ public void no_stack_or_dom_loading_callback_in_partial_mode()
+ {
+ DocumentLinker linker = mockDocumentLinker();
+ ClientInfrastructure infra = mockClientInfrastucture();
+
+ linker.addScript("doSomething();\n");
+
+ replay();
+
+ JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, infra, new IdAllocator(), true);
+
+ jss.addScript("doSomething();");
+
+ jss.commit();
+
+ verify();
+ }
+
+ @Test
public void adding_script_will_add_stack()
{
DocumentLinker linker = mockDocumentLinker();