You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/08/08 02:37:26 UTC
svn commit: r429527 - in /tapestry/tapestry4/trunk:
tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/
tapestry-examples/TimeTracker/
tapestry-examples/Workbench/src/context/WEB-INF/
Author: jkuhnert
Date: Mon Aug 7 17:37:25 2006
New Revision: 429527
URL: http://svn.apache.org/viewvc?rev=429527&view=rev
Log:
Fixed inspector by using DirectLink instead of ActionLink. Updated component workbench demo accordingly.
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.page
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Selector.jwc
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.html
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.java
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.page?rev=429527&r1=429526&r2=429527&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.page (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Inspector.page Mon Aug 7 17:37:25 2006
@@ -21,7 +21,7 @@
<page-specification class="org.apache.tapestry.contrib.inspector.Inspector">
- <property name="view" persist="session" initial-value="@org.apache.tapestry.contrib.inspector.View@SPECIFICATION"/>
+ <property name="view" persist="session" initial-value="ognl:@org.apache.tapestry.contrib.inspector.View@SPECIFICATION"/>
<property name="inspectedPageName" persist="session"/>
<property name="inspectedIdPath" persist="session"/>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Selector.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Selector.jwc?rev=429527&r1=429526&r2=429527&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Selector.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/Selector.jwc Mon Aug 7 17:37:25 2006
@@ -28,7 +28,7 @@
<component id="selectPage" type="PropertySelection">
<binding name="value" value="page.inspectedPageName"/>
<binding name="model" value="pageModel"/>
- <binding name="onchange" value="literal:javascript:this.form.events.submit();"/>
+ <binding name="onchange" value="literal:tapestry.form.submit(this.form)"/>
</component>
<component id="page" type="DirectLink">
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.html?rev=429527&r1=429526&r2=429527&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.html (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.html Mon Aug 7 17:37:25 2006
@@ -18,8 +18,8 @@
<table border="0" cellpadding="0" cellspacing="2">
<tr>
<td>
-<span jwcid="@Foreach" source="ognl:views" value="ognl:view">
- <a jwcid="select@ActionLink" listener="listener:selectTab"><img
+<span jwcid="@For" source="ognl:views" value="ognl:view">
+ <a jwcid="select@DirectLink" listener="listener:selectTab" parameters="ognl:view"><img
jwcid="@Rollover" image="ognl:viewImage" focus="ognl:focusImage"
width="120" height="19"/></a>
</span>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.java?rev=429527&r1=429526&r2=429527&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/inspector/ViewTabs.java Mon Aug 7 17:37:25 2006
@@ -16,7 +16,6 @@
import org.apache.tapestry.BaseComponent;
import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IRequestCycle;
/**
* Component of the {@link Inspector} page used to select the view.
@@ -55,7 +54,7 @@
buffer.append("_focus");
String key = buffer.toString();
-
+
return (IAsset) getAssets().get(key);
}
@@ -73,14 +72,15 @@
{
Inspector inspector = (Inspector) getPage();
String selectedView = inspector.getView();
+
String key = selectedView + "_banner";
-
+
return (IAsset) getAssets().get(key);
}
- public void selectTab(IRequestCycle cycle)
+ public void selectTab(String view)
{
Inspector inspector = (Inspector) getPage();
- inspector.setView(getView());
+ inspector.setView(view);
}
}
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml?rev=429527&r1=429526&r2=429527&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml Mon Aug 7 17:37:25 2006
@@ -10,7 +10,7 @@
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
- <version>4.1</version>
+ <version>4.1.1-SNAPSHOT</version>
</parent>
<name>Tapestry Core Library</name>
<inceptionYear>2006</inceptionYear>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc?rev=429527&r1=429526&r2=429527&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc Mon Aug 7 17:37:25 2006
@@ -34,12 +34,12 @@
<component id="inputRequestDebug" type="Checkbox">
<binding name="value" value="visit.requestDebug"/>
- <binding name="onclick" value="literal:javascript:this.form.events.submit();"/>
+ <binding name="onclick" value="literal:tapestry.form.submit(this.form)"/>
</component>
<component id="inputDisableInspector" type="Checkbox">
<binding name="value" value="visit.disableInspector"/>
- <binding name="onclick" value="literal:javascript:this.form.events.submit();"/>
+ <binding name="onclick" value="literal:tapestry.form.submit(this.form)"/>
</component>
<asset name="inactiveLeft" path="images/tab-inactive-left.gif"/>