[richfaces-svn-commits] JBoss Rich Faces SVN: r18748 - in trunk: examples/output-demo/src/main/webapp/qunit and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 18 07:18:23 EDT 2010
Author: Alex.Kolonitsky
Date: 2010-08-18 07:18:22 -0400 (Wed, 18 Aug 2010)
New Revision: 18748
Modified:
trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml
trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml
trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml
trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml
trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml
trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml
trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
Log:
RF-9007 componentControl: change forPanel to just for
Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -22,38 +22,38 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name1" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" />
name1
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" />
name2
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name3" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" />
name3
</h:outputLink>
<br/>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@first" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/>
|< first
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@prev" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/>
<- prev
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@next" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/>
next ->
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@last" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/>
last >|
</h:outputLink>
</h:form>
Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -20,38 +20,38 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name1" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" />
name1
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" />
name2
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name3" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" />
name3
</h:outputLink>
<br />
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@first" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@first" event="click" />
|< first
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@prev" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click" />
<- prev
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@next" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@next" event="click" />
next ->
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@last" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@last" event="click" />
last >|
</h:outputLink>
</h:form>
Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -20,38 +20,38 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name1" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" />
name1 client
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" />
name2 ajax
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name3" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" />
name3 server
</h:outputLink>
<br />
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@first" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@first" event="click" />
|< first
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@prev" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click" />
<- prev
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@next" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@next" event="click" />
next ->
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@last" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="@last" event="click" />
last >|
</h:outputLink>
</h:form>
Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -21,38 +21,38 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name1" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" />
name1
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" />
name2
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name3" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" />
name3
</h:outputLink>
<br/>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@first" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/>
|< first
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@prev" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/>
<- prev
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@next" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/>
next ->
</h:outputLink>
|
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="@last" event="click"/>
+ <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/>
last >|
</h:outputLink>
</h:form>
Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -23,7 +23,7 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="my_id" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="my_id" targetItem="name2" event="click" />
Click me :) it is toggle control
</h:outputLink>
Modified: trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -29,15 +29,15 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name1" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" />
name1
</h:outputLink>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" />
name2
</h:outputLink>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name3" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" />
name3
</h:outputLink>
</h:form>
Modified: trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -29,15 +29,15 @@
</pn:togglePanel>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name1" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" />
name1
</h:outputLink>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name2" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" />
name2
</h:outputLink>
<h:outputLink>
- <pn:toggleControl forPanel="panel" targetItem="name3" event="click" />
+ <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" />
name3
</h:outputLink>
</h:form>
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-18 11:18:22 UTC (rev 18748)
@@ -34,13 +34,13 @@
</rich:togglePanel>
<a4j:outputPanel id="tabs">
<a4j:outputPanel layout="block" styleClass="tabDiv">
- <rich:toggleControl event="click" forPanel="panel1"
+ <rich:toggleControl event="click" targetPanel="panel1"
targetItem="item1" />
<h:outputText value="Toggle Panel Item 1"
style="#{rich:findComponent('panel1').activeItem == 'item1' ? 'font-weight:bold' : 'font-weight:normal'}" />
</a4j:outputPanel>
<a4j:outputPanel layout="block" styleClass="tabDiv">
- <rich:toggleControl event="click" forPanel="panel1"
+ <rich:toggleControl event="click" targetPanel="panel1"
targetItem="item2" />
<h:outputText value="Toggle Panel Item 2"
style="#{rich:findComponent('panel1').activeItem == 'item2' ? 'font-weight:bold' : 'font-weight:normal'}" />
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-08-18 10:21:49 UTC (rev 18747)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-08-18 11:18:22 UTC (rev 18748)
@@ -41,7 +41,7 @@
private enum PropertyKeys {
event,
targetItem,
- forPanel,
+ targetPanel,
disableDefault
}
@@ -61,12 +61,12 @@
getStateHelper().put(PropertyKeys.targetItem, target);
}
- public String getForPanel() {
- return (String) getStateHelper().eval(PropertyKeys.forPanel);
+ public String getTargetPanel() {
+ return (String) getStateHelper().eval(PropertyKeys.targetPanel);
}
- public void setForPanel(String selector) {
- getStateHelper().put(PropertyKeys.forPanel, selector);
+ public void setTargetPanel(String selector) {
+ getStateHelper().put(PropertyKeys.targetPanel, selector);
}
public void setDisableDefault(Boolean disableDefault) {
@@ -82,7 +82,7 @@
}
public AbstractTogglePanel getPanel(UIComponent comp) throws FacesException {
- String target = this.getForPanel();
+ String target = this.getTargetPanel();
if (target != null) {
@@ -121,7 +121,7 @@
// } else if (compare(PropertyKeys.target, name)) {
// setTargetItem((String) value);
// } else if (compare(PropertyKeys.selector, name)) {
-// setForPanel((String) value);
+// setTargetPanel((String) value);
// }
}
}
\ No newline at end of file
More information about the richfaces-svn-commits
mailing list