Author: jkuhnert
Date: Fri Dec 8 19:27:33 2006
New Revision: 484903
URL: http://svn.apache.org/viewvc?view=rev&rev=484903
Log:
Not sure how these weren't noticed yet but they're fixed now.
Note, ForBean doesn't have a unit test. If nothing else gets one it needs it as
badly as any other core
component . (like form/if / etc)
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.jwc
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.jwc
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AbstractWidget.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/RadioGroup.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.jwc?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.jwc
Fri Dec 8 19:27:33 2006
@@ -27,11 +27,13 @@
<component id="condSorted" type="If">
<binding name="condition" expression="columnSorted"/>
+ <binding name="renderTag" expression="false" />
</component>
<component id="condNotSorted" type="Else">
<binding name="condition" expression="columnSorted"/>
<static-binding name="invert">true</static-binding>
+ <binding name="renderTag" expression="false" />
</component>
<component id="insertSortedColumn" type="Insert">
@@ -53,6 +55,7 @@
<component id="condSort" type="If">
<binding name="condition" expression="isSorted"/>
+ <binding name="renderTag" expression="false" />
</component>
<private-asset name="sortDown" resource-path="arrow-down.gif"/>
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.jwc?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.jwc
Fri Dec 8 19:27:33 2006
@@ -37,10 +37,12 @@
<component id="condSorted" type="If">
<binding name="condition" expression="columnSorted"/>
+ <binding name="renderTag" expression="false" />
</component>
<component id="condNotSorted" type="Else">
<binding name="condition" expression="!columnSorted"/>
+ <binding name="renderTag" expression="false" />
</component>
<component id="insertSortedColumn" type="Insert">
@@ -63,6 +65,7 @@
<component id="condSort" type="If">
<binding name="condition" expression="isSorted"/>
+ <binding name="renderTag" expression="false" />
</component>
<private-asset name="sortDown" resource-path="arrow-down.gif"/>
Modified:
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
Fri Dec 8 19:27:33 2006
@@ -1,5 +1,5 @@
<html jwcid="@Shell" stylesheet="asset:stylesheet"
- title="message:window.title" browserLogLevel="DEBUG"
consoleEnabled="true" debugEnabled="true">
+ title="message:window.title" browserLogLevel="DEBUG"
consoleEnabled="true" debugEnabled="false">
<body jwcid="@Body">
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
Fri Dec 8 19:27:33 2006
@@ -139,7 +139,7 @@
String element = HiveMind.isNonBlank(getElement()) ? getElement() :
getTemplateTagName();
- boolean render = !cycleRewinding && HiveMind.isNonBlank(element);
+ boolean render = !cycleRewinding && HiveMind.isNonBlank(element) &&
getRenderTag();
IMarkupWriter loopWriter = writer;
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AbstractWidget.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AbstractWidget.java?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AbstractWidget.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AbstractWidget.java
Fri Dec 8 19:27:33 2006
@@ -43,10 +43,21 @@
{
if(!cycle.isRewinding()) {
- if (cycle.getResponseBuilder().explicitlyContains(this))
+ if (!cycle.getResponseBuilder().isDynamic()
+ || cycle.getResponseBuilder().explicitlyContains(this)) {
+
setDestroy(false);
- else
+ } else
setDestroy(true);
+ }
+
+ // don't render if not part of update response
+
+ if (cycle.getResponseBuilder().isDynamic()
+ && (!cycle.getResponseBuilder().explicitlyContains(this)
+ && !cycle.getResponseBuilder().contains(this))) {
+
+ return;
}
renderWidget(writer, cycle);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script
Fri Dec 8 19:27:33 2006
@@ -18,7 +18,6 @@
limitations under the License.
-->
<script>
-
<input-symbol key="component" required="yes" />
<input-symbol key="props" required="yes" />
<body>
@@ -28,12 +27,10 @@
</body>
<initialization>
tapestry.widget.synchronizeWidgetState("${component.clientId}", "Dialog",
${props}, ${component.destroy});
-
<if expression="component.hidden">
dojo.widget.byId("${component.clientId}").hide();
</if><if-not expression="component.hidden">
dojo.widget.byId("${component.clientId}").show();
</if-not>
</initialization>
-
-</script>
\ No newline at end of file
+</script>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/RadioGroup.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/RadioGroup.java?view=diff&rev=484903&r1=484902&r2=484903
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/RadioGroup.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/RadioGroup.java
Fri Dec 8 19:27:33 2006
@@ -162,7 +162,7 @@
renderBody(writer, cycle);
- writer.closeTag();
+ writer.end();
renderDelegateSuffix(writer, cycle);
