JBoss Rich Faces SVN: r20353 - sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-12-03 09:25:07 -0500 (Fri, 03 Dec 2010)
New Revision: 20353
Modified:
sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
Log:
drop-down menu client-code update
https://jira.jboss.org/browse/RF-9785
Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
===================================================================
--- sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-03 14:22:55 UTC (rev 20352)
+++ sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-03 14:25:07 UTC (rev 20353)
@@ -40,6 +40,7 @@
this.popupList = new RichFaces.ui.PopupList(this.id + "_list", this, this.options);
this.selectedGroup = null;
rf.Event.bindById(this.id, this.options.showEvent, $.proxy(this.___showHandler, this), this);
+ rf.Event.bindById(this.id, "mouseover", $.proxy(this.__overHandler, this), this);
rf.Event.bindById(this.id, "mouseleave", $.proxy(this.__leaveHandler, this), this);
};
14 years, 1 month
JBoss Rich Faces SVN: r20352 - trunk/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-12-03 09:22:55 -0500 (Fri, 03 Dec 2010)
New Revision: 20352
Modified:
trunk/examples/pom.xml
Log:
add module
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2010-12-03 14:22:23 UTC (rev 20351)
+++ trunk/examples/pom.xml 2010-12-03 14:22:55 UTC (rev 20352)
@@ -50,6 +50,7 @@
<module>push-demo</module>
<module>richfaces-showcase</module>
<module>validator-demo</module>
+ <module>dnd-demo</module>
</modules>
<scm>
14 years, 1 month
JBoss Rich Faces SVN: r20351 - in trunk/ui: dnd and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-12-03 09:22:23 -0500 (Fri, 03 Dec 2010)
New Revision: 20351
Modified:
trunk/ui/dnd/pom.xml
trunk/ui/pom.xml
Log:
fix poms, add dnd module
Modified: trunk/ui/dnd/pom.xml
===================================================================
--- trunk/ui/dnd/pom.xml 2010-12-03 14:19:48 UTC (rev 20350)
+++ trunk/ui/dnd/pom.xml 2010-12-03 14:22:23 UTC (rev 20351)
@@ -29,8 +29,8 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui.output</groupId>
- <artifactId>richfaces-ui-output-aggregator</artifactId>
+ <groupId>org.richfaces.ui.dnd</groupId>
+ <artifactId>richfaces-ui-dnd-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Richfaces UI Components: Drag-n-Drop Aggregator</name>
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2010-12-03 14:19:48 UTC (rev 20350)
+++ trunk/ui/pom.xml 2010-12-03 14:22:23 UTC (rev 20351)
@@ -44,6 +44,7 @@
<module>output</module>
<module>input</module>
<module>dist</module>
+ <module>dnd</module>
<module>validator</module>
</modules>
</project>
14 years, 1 month
JBoss Rich Faces SVN: r20350 - modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-03 09:19:48 -0500 (Fri, 03 Dec 2010)
New Revision: 20350
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
Log:
* unnecessary IDs removed
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-03 14:11:09 UTC (rev 20349)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-03 14:19:48 UTC (rev 20350)
@@ -116,27 +116,27 @@
</script>
<h:commandButton id="switchButton1" value="switch to tab1">
- <rich:componentControl id="componentControl1" event="click" operation="switchToItem" target="tabPanel" >
+ <rich:componentControl event="click" operation="switchToItem" target="tabPanel" >
<f:param value="tab1" />
</rich:componentControl>
</h:commandButton>
<h:commandButton id="switchButton2" value="switch to tab2">
- <rich:componentControl id="componentControl2" event="click" operation="switchToItem" target="tabPanel" >
+ <rich:componentControl event="click" operation="switchToItem" target="tabPanel" >
<f:param value="tab2" />
</rich:componentControl>
</h:commandButton>
<h:commandButton id="switchButton3" value="switch to tab3">
- <rich:componentControl id="componentControl3" event="click" operation="switchToItem" target="tabPanel" >
+ <rich:componentControl event="click" operation="switchToItem" target="tabPanel" >
<f:param value="tab3" />
</rich:componentControl>
</h:commandButton>
<h:commandButton id="switchButton4" value="switch to tab4">
- <rich:componentControl id="componentControl4" event="click" operation="switchToItem" target="tabPanel" >
+ <rich:componentControl event="click" operation="switchToItem" target="tabPanel" >
<f:param value="tab4" />
</rich:componentControl>
</h:commandButton>
<h:commandButton id="switchButton5" value="switch to tab5">
- <rich:componentControl id="componentControl5" event="click" operation="switchToItem" target="tabPanel" >
+ <rich:componentControl event="click" operation="switchToItem" target="tabPanel" >
<f:param value="tab5" />
</rich:componentControl>
</h:commandButton>
14 years, 1 month
JBoss Rich Faces SVN: r20349 - sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-12-03 09:11:09 -0500 (Fri, 03 Dec 2010)
New Revision: 20349
Modified:
sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js
Log:
drop-down menu client-code update
https://jira.jboss.org/browse/RF-9785
Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js
===================================================================
--- sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-03 14:06:54 UTC (rev 20348)
+++ sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-03 14:11:09 UTC (rev 20349)
@@ -80,7 +80,7 @@
},
processItem: function(item) {
- if (item && item.atrr('id') && !this.isDisabled(item) && this.isGroup(item)) {
+ if (item && item.attr('id') && !this.__isDisabled(item) && this.__isGroup(item)) {
this.invokeEvent("itemclick", rf.getDomElement(this.id), null);
this.hidePopup();
}
@@ -126,7 +126,7 @@
},
__isGroup: function(item) {
- return 'object' == typeof this.groupList[item.atrr('id')];
+ return 'object' == typeof this.groupList[item.attr('id')];
},
__isDisabled: function(item) {
Modified: sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js
===================================================================
--- sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js 2010-12-03 14:06:54 UTC (rev 20348)
+++ sandbox/trunk/ui/dropdown-menu/ui/src/main/resources/META-INF/resources/org.richfaces/popupList.js 2010-12-03 14:11:09 UTC (rev 20349)
@@ -176,11 +176,10 @@
}
},
- __onClick: function(e) {
- console.info("e.target: "+$(e.target).attr('id')+"; e.currentTarget:"+$(e.currentTarget).attr('id'));
+ __onClick: function(e) {
var item = this.__getItem(e);
- //this.processItem($(item));
- //this.__select(item);
+ this.processItem($(item));
+ this.__select(item);
},
__getItem: function(e) {
14 years, 1 month
JBoss Rich Faces SVN: r20347 - in trunk: ui/output/ui/src/main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-03 09:06:43 -0500 (Fri, 03 Dec 2010)
New Revision: 20347
Modified:
trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml
trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml
Log:
RF-9317 - panelMenu components
item label
Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2010-12-03 14:06:43 UTC (rev 20347)
@@ -64,9 +64,9 @@
>
<pn:panelMenuGroup label="Group 1">
- <pn:panelMenuItem label="Item 1.1" />
- <pn:panelMenuItem label="Item 1.2" />
- <pn:panelMenuItem label="Item 1.3" />
+ <pn:panelMenuItem>Item 1.1</pn:panelMenuItem>
+ <pn:panelMenuItem>Item 1.2</pn:panelMenuItem>
+ <pn:panelMenuItem>Item 1.3</pn:panelMenuItem>
</pn:panelMenuGroup>
<pn:panelMenuGroup
label="Group 2"
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2010-12-03 14:06:43 UTC (rev 20347)
@@ -53,7 +53,7 @@
}
public String getLabel() {
- return (String) getStateHelper().eval(PropertyKeys.label, getName());
+ return (String) getStateHelper().eval(PropertyKeys.label);
}
public void setLabel(String label) {
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2010-12-03 14:06:43 UTC (rev 20347)
@@ -122,7 +122,7 @@
writer.startElement("td", null);
writer.writeAttribute("class", classPrefix + "-lbl", null);
- writer.writeText(menuItem.getLabel(), null);
+ writer.writeText(String.valueOf(menuItem.getLabel()), null);
writer.endElement("td");
encodeHeaderGroupIconRight(writer, context, menuItem, classPrefix);
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2010-12-03 14:06:43 UTC (rev 20347)
@@ -57,10 +57,10 @@
super.doEncodeBegin(writer, context, component);
HtmlPanelMenuItem menuItem = (HtmlPanelMenuItem) component;
- encodeHeaderGroup(writer, context, menuItem, menuItem.isTopItem() ? TOP_CSS_CLASS_PREFIX : CSS_CLASS_PREFIX);
+ encodeHeaderGroupBegin(writer, context, menuItem, getCssClass(menuItem, ""));
}
- private void encodeHeaderGroup(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException {
+ private void encodeHeaderGroupBegin(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException {
writer.startElement("table", null);
writer.writeAttribute("class", classPrefix + "-gr", null);
writer.startElement("tr", null);
@@ -69,7 +69,14 @@
writer.startElement("td", null);
writer.writeAttribute("class", classPrefix + "-lbl", null);
- writer.writeText(menuItem.getLabel(), null);
+
+ String label = menuItem.getLabel();
+ if (label != null) {
+ writer.writeText(label, null);
+ }
+ }
+
+ private void encodeHeaderGroupEnd(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException {
writer.endElement("td");
encodeHeaderGroupRightIcon(writer, context, menuItem, classPrefix);
@@ -148,6 +155,9 @@
@Override
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ HtmlPanelMenuItem menuItem = (HtmlPanelMenuItem) component;
+ encodeHeaderGroupEnd(writer, context, menuItem, getCssClass(menuItem, ""));
+
super.doEncodeEnd(writer, context, component);
}
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2010-12-03 14:06:43 UTC (rev 20347)
@@ -77,13 +77,13 @@
<pn:panelMenuGroup id="panelMenuGroup-top"></pn:panelMenuGroup>
<pn:panelMenuGroup id="panelMenuGroup-topDis" disabled="true"></pn:panelMenuGroup>
- <pn:panelMenuItem id="panelMenuItem-top"></pn:panelMenuItem>
- <pn:panelMenuItem id="panelMenuItem-topDis" disabled="true"></pn:panelMenuItem>
+ <pn:panelMenuItem id="panelMenuItem-top">Hello</pn:panelMenuItem>
+ <pn:panelMenuItem id="panelMenuItem-topDis" disabled="true">Hello</pn:panelMenuItem>
<pn:panelMenuGroup>
<pn:panelMenuGroup id="panelMenuGroup"></pn:panelMenuGroup>
<pn:panelMenuGroup id="panelMenuGroup-dis" disabled="true"></pn:panelMenuGroup>
- <pn:panelMenuItem id="panelMenuItem"></pn:panelMenuItem>
- <pn:panelMenuItem id="panelMenuItem-dis" disabled="true"></pn:panelMenuItem>
+ <pn:panelMenuItem id="panelMenuItem">Hello</pn:panelMenuItem>
+ <pn:panelMenuItem id="panelMenuItem-dis" disabled="true">Hello</pn:panelMenuItem>
</pn:panelMenuGroup>
</pn:panelMenu>
</h:form>
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml 2010-12-03 14:06:43 UTC (rev 20347)
@@ -40,7 +40,7 @@
<pn:panelMenu>
<pn:panelMenuGroup>
<pn:panelMenuItem id="panelMenuItem">
- <!-- TODO -->
+ My MY Item
</pn:panelMenuItem>
</pn:panelMenuGroup>
</pn:panelMenu>
Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml
===================================================================
--- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml 2010-12-03 14:03:01 UTC (rev 20346)
+++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml 2010-12-03 14:06:43 UTC (rev 20347)
@@ -3,7 +3,7 @@
<tbody>
<tr>
<td class="rf-pm-itm-ico rf-pm-none"></td>
- <td class="rf-pm-itm-lbl">panelMenuItem</td>
+ <td class="rf-pm-itm-lbl">My MY Item</td>
<td class="rf-pm-itm-exp-ico rf-pm-none"></td>
</tr>
</tbody>
14 years, 1 month
JBoss Rich Faces SVN: r20346 - in trunk/examples: dnd-demo/src/main/java/org/demo and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-12-03 09:03:01 -0500 (Fri, 03 Dec 2010)
New Revision: 20346
Added:
trunk/examples/dnd-demo/
trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java
Removed:
trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java
Log:
move from sandbox
Copied: trunk/examples/dnd-demo (from rev 20328, sandbox/trunk/examples/dnd-demo)
Deleted: trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java
===================================================================
--- sandbox/trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java 2010-12-03 09:36:22 UTC (rev 20328)
+++ trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java 2010-12-03 14:03:01 UTC (rev 20346)
@@ -1,63 +0,0 @@
-package org.demo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-
-import org.richfaces.event.DropEvent;
-
-@ManagedBean
-@SessionScoped
-public class DataBean {
-
- private List<String> dropValues = new ArrayList<String>();
-
- private String dragValue1 = "dragValue 1";
-
- private String dragValue2 = "dragValue 3";
-
- private String dragValue3 = "dragValue 3";
-
-
- public List<String> getDropValues(){
- return dropValues;
- }
-
- public String getDragValue1() {
- return dragValue1;
- }
-
- public void setDragValue1(String dragValue1) {
- this.dragValue1 = dragValue1;
- }
-
- public String getDragValue2() {
- return dragValue2;
- }
-
- public void setDragValue2(String dragValue2) {
- this.dragValue2 = dragValue2;
- }
-
- public String getDragValue3() {
- return dragValue3;
- }
-
- public void setDragValue3(String dragValue3) {
- this.dragValue3 = dragValue3;
- }
-
- public void setDropValues(List<String> dropValues){
- this.dropValues = dropValues;
- }
-
- public void processEvent(DropEvent event) {
- String value = (String)event.getDragValue();
- dropValues.add(value);
- System.out.println("DataBean.processEvent()");
- }
-
-
-}
Copied: trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java (from rev 20337, sandbox/trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java)
===================================================================
--- trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java (rev 0)
+++ trunk/examples/dnd-demo/src/main/java/org/demo/DataBean.java 2010-12-03 14:03:01 UTC (rev 20346)
@@ -0,0 +1,63 @@
+package org.demo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+
+import org.richfaces.event.DropEvent;
+
+@ManagedBean
+@SessionScoped
+public class DataBean {
+
+ private List<String> dropValues = new ArrayList<String>();
+
+ private String dragValue1 = "dragValue 1";
+
+ private String dragValue2 = "dragValue 3";
+
+ private String dragValue3 = "dragValue 3";
+
+
+ public List<String> getDropValues(){
+ return dropValues;
+ }
+
+ public String getDragValue1() {
+ return dragValue1;
+ }
+
+ public void setDragValue1(String dragValue1) {
+ this.dragValue1 = dragValue1;
+ }
+
+ public String getDragValue2() {
+ return dragValue2;
+ }
+
+ public void setDragValue2(String dragValue2) {
+ this.dragValue2 = dragValue2;
+ }
+
+ public String getDragValue3() {
+ return dragValue3;
+ }
+
+ public void setDragValue3(String dragValue3) {
+ this.dragValue3 = dragValue3;
+ }
+
+ public void setDropValues(List<String> dropValues){
+ this.dropValues = dropValues;
+ }
+
+ public void processEvent(DropEvent event) {
+ String value = (String)event.getDragSource().getDragValue();
+ dropValues.add(value);
+ System.out.println("DataBean.processEvent()");
+ }
+
+
+}
14 years, 1 month
JBoss Rich Faces SVN: r20344 - trunk/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-12-03 08:57:04 -0500 (Fri, 03 Dec 2010)
New Revision: 20344
Added:
trunk/examples/dnd-demo/
Log:
demo from the sandbox
Copied: trunk/examples/dnd-demo (from rev 20328, sandbox/trunk/examples/dnd-demo)
14 years, 1 month