JBoss Rich Faces SVN: r5116 - in trunk/sandbox/ui: combobox/src/main/java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-12-30 15:09:15 -0500 (Sun, 30 Dec 2007)
New Revision: 5116
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java
trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
Log:
code review results committed
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2007-12-29 18:51:42 UTC (rev 5115)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2007-12-30 20:09:15 UTC (rev 5116)
@@ -12,8 +12,10 @@
* @author Anton Belevich
*
*/
+
+//TODO add @since declaration to newly-created classes
public abstract class UIComboBox extends UIInput {
-
+ //TODO should be Object, can be Collection of objects or array
public abstract List <String> getSuggestionValues();
public abstract void setSuggestionValues( List value);
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-29 18:51:42 UTC (rev 5115)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-30 20:09:15 UTC (rev 5116)
@@ -2,16 +2,13 @@
import java.io.IOException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.javascript.ScriptString;
@@ -62,6 +59,9 @@
UIComboBox comboBox = (UIComboBox)component;
List <String> suggestionValues = comboBox.getSuggestionValues();
ResponseWriter writer = context.getResponseWriter();
+ //TODO we do not need to sort that
+ //TODO changing initial data source is a bad idea
+ //TODO should go after null check probably
Collections.sort(suggestionValues);
if (suggestionValues != null) {
for (Iterator <String> iterator = suggestionValues.iterator(); iterator.hasNext();) {
Modified: trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2007-12-29 18:51:42 UTC (rev 5115)
+++ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2007-12-30 20:09:15 UTC (rev 5116)
@@ -6,10 +6,7 @@
package org.richfaces.component;
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.component.UIPoll;
-import org.ajax4jsf.context.AjaxContext;
/**
* TODO Class description goes here.
@@ -17,10 +14,13 @@
* @author "Andrey Markavtsov"
*
*/
+
+//TODO add @since declaration
public abstract class UIProgressBar extends UIPoll {
public static final String COMPONENT_TYPE = "org.richfaces.ProgressBar";
public static final String COMPONENT_FAMILY = "org.richfaces.ProgressBar";
+ //TODO value can be any number, e.g. big decimal
}
Modified: trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2007-12-29 18:51:42 UTC (rev 5115)
+++ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2007-12-30 20:09:15 UTC (rev 5116)
@@ -87,6 +87,8 @@
writer.endElement(HTML.SPAN_ELEM);
}
+ //TODO do not encode content twice, use node cloning on client
+ //TODO provide client script with percent value
public void encodePersent(FacesContext context, UIComponent component)
throws IOException {
ResponseWriter writer = context.getResponseWriter();
16 years, 12 months
JBoss Rich Faces SVN: r5115 - branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2007-12-29 13:51:42 -0500 (Sat, 29 Dec 2007)
New Revision: 5115
Modified:
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
Log:
RF-1592
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-12-29 18:14:44 UTC (rev 5114)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-12-29 18:51:42 UTC (rev 5115)
@@ -68,13 +68,14 @@
this.currentScrollPos = 0;
this.controlCreated = true;
- this.updateLayout();
-
- if (ClientUILib.isIE && !ClientUILib.isIE7) {
- var grid = this;
- setTimeout(function() {grid.updateLayout()}, 50);
- }
+ var grid = this;
+ Utils.execOnLoad(
+ function(){
+ grid.updateLayout();
+ },
+ Utils.Condition.ElementPresent(grid.client_id), 100);
},
+
updateLayout: function($super) {
if(!this.controlCreated || this.getHeight()==0) {
return;
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-12-29 18:14:44 UTC (rev 5114)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-12-29 18:51:42 UTC (rev 5115)
@@ -16,39 +16,21 @@
{pane: GridLayout_Enum.BODY, ref: this.client_id +"_" + "GridBodyTemplate"},
{pane: GridLayout_Enum.FOOTER, ref: this.client_id +"_" + "GridFooterTemplate"}
];
- var grid = this;
- var s = $super;
- Utils.execOnLoad(
- function(){
- grid.init(s);
- },
- Utils.Condition.ElementPresent(grid.client_id), 100);
+ this.startCreateTime = (new Date()).getTime();
+
+ $super(this.client_id, this.dataModel, this.templates);
+
+ this.endCreateTime = (new Date()).getTime();
+ Event.observe(this.element, "grid:onsort", this.onSorted.bindAsEventListener(this));
+ if (this.options.selectionInput) {
+ this.selectionManager = new ClientUI.controls.grid.SelectionManager(this);
+ }
+ this.getBody().restoreScrollState();
this.endInitTime = (new Date()).getTime();
this.rowCallbacks = [];
},
-
-// initialize parent Grid
- init: function(superCtor){
- // mark that grid control initialized
- if(!this.isInitialized) {
- this.isInitialized = true;
- this.startCreateTime = (new Date()).getTime();
-
- superCtor(this.client_id, this.dataModel, this.templates);
-
- this.endCreateTime = (new Date()).getTime();
-
- Event.observe(this.element, "grid:onsort", this.onSorted.bindAsEventListener(this));
- if (this.options.selectionInput) {
- this.selectionManager = new ClientUI.controls.grid.SelectionManager(this);
- }
- this.element.fire("grid:initialized");
- this.getBody().restoreScrollState();
- }
- },
-
onSortComplete : function(request, event, data){
this.dataModel.count = $(this.client_id + "_rows_input").value;
var options = request.getJSON("options");
16 years, 12 months
JBoss Rich Faces SVN: r5114 - trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-29 13:14:44 -0500 (Sat, 29 Dec 2007)
New Revision: 5114
Modified:
trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
Log:
http://jira.jboss.com/jira/browse/RF-1649
Modified: trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
===================================================================
--- trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-12-29 17:00:18 UTC (rev 5113)
+++ trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-12-29 18:14:44 UTC (rev 5114)
@@ -84,8 +84,8 @@
this.onBlurListener = this.onBlur.bindAsEventListener(this);
Event.observe(this.element, "blur", this.onBlurListener);
- this.onKeyPressListener = this.onKeyPress.bindAsEventListener(this);
- Event.observe(this.element, "keypress", this.onKeyPressListener);
+ this.onKeyDownListener = this.onKeyDown.bindAsEventListener(this);
+ Event.observe(this.element, "keydown", this.onKeyDownListener);
if (this.isOpera) {
this.onKeyUpListener = this.onKeyUp.bindAsEventListener(this);
@@ -210,12 +210,12 @@
LOG.info("Element unloaded from DOM");
if (this.element) {
Event.stopObserving(this.element, "blur", this.onBlurListener);
- Event.stopObserving(this.element, "keypress", this.onKeyPressListener);
+ Event.stopObserving(this.element, "keydown", this.onKeyDownListener);
}
return true;
},
- onKeyPress: function(event) {
+ onKeyDown: function(event) {
if (this.isUnloaded()) return;
if (!this.initialized) {
if (this.options.iframeId) {
16 years, 12 months
JBoss Rich Faces SVN: r5113 - trunk/ui/tabPanel/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2007-12-29 12:00:18 -0500 (Sat, 29 Dec 2007)
New Revision: 5113
Modified:
trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-262 - description for events of label
Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
===================================================================
--- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-12-29 16:41:16 UTC (rev 5112)
+++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2007-12-29 17:00:18 UTC (rev 5113)
@@ -243,41 +243,65 @@
<property>
<name>onlabelkeypress</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a key within label is pressed and released
+ </description>
</property>
<property>
<name>onlabeldblclick</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a pointer within label is double-clicked
+ </description>
</property>
<property>
<name>onlabelkeyup</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a key within label is released
+ </description>
</property>
<property>
<name>onlabelclick</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a label of the tab is clicked
+ </description>
</property>
<property>
<name>onlabelkeydown</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a key within label is pressed down
+ </description>
</property>
<property>
<name>onlabelmouseup</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a pointer within label is released
+ </description>
</property>
<property>
<name>onlabelmousedown</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a pointer within label is pressed down
+ </description>
</property>
<property>
<name>onlabelmousemove</name>
<classname>java.lang.String</classname>
+ <description>
+ A JavaScript event handler; a pointer is moved within label
+ </description>
</property>
</component>
16 years, 12 months
JBoss Rich Faces SVN: r5112 - trunk/sandbox/samples/pickList-sample/src/main/webapp/pages.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2007-12-29 11:41:16 -0500 (Sat, 29 Dec 2007)
New Revision: 5112
Modified:
trunk/sandbox/samples/pickList-sample/src/main/webapp/pages/index.jsp
Log:
add width
Modified: trunk/sandbox/samples/pickList-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/pickList-sample/src/main/webapp/pages/index.jsp 2007-12-29 16:40:57 UTC (rev 5111)
+++ trunk/sandbox/samples/pickList-sample/src/main/webapp/pages/index.jsp 2007-12-29 16:41:16 UTC (rev 5112)
@@ -8,7 +8,7 @@
<body>
<f:view>
<h:form>
- <pickList:pickList size="5" valueChangeListener="#{pickBean.selectionChanged}">
+ <pickList:pickList width="200px" size="5" valueChangeListener="#{pickBean.selectionChanged}">
<f:selectItem itemValue="cat" itemLabel="cat"/>
<f:selectItem itemValue="dog" itemLabel="dog"/>
<f:selectItems value="#{pickBean.testList}"/>
16 years, 12 months
JBoss Rich Faces SVN: r5111 - in trunk/sandbox/ui/pickList/src/main: java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2007-12-29 11:40:57 -0500 (Sat, 29 Dec 2007)
New Revision: 5111
Modified:
trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml
trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
Log:
add width attribute
Modified: trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml 2007-12-29 15:44:14 UTC (rev 5110)
+++ trunk/sandbox/ui/pickList/src/main/config/component/picklist.xml 2007-12-29 16:40:57 UTC (rev 5111)
@@ -109,8 +109,13 @@
<classname>java.lang.String</classname>
</property>
+ <property>
+ <name>width</name>
+ <classname>java.lang.String</classname>
+ <defaultvalue>"70px"</defaultvalue>
+ </property>
+
-
</properties>
</component>
Modified: trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
===================================================================
--- trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2007-12-29 15:44:14 UTC (rev 5110)
+++ trunk/sandbox/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2007-12-29 16:40:57 UTC (rev 5111)
@@ -174,13 +174,17 @@
writer.endElement("table");
}
- private void encodeSelect(FacesContext facesContext, UIComponent uiComponent, String clientId, boolean disabled,
+ private void encodeSelect(FacesContext context, UIComponent component, String clientId, boolean disabled,
int size, List selectItemsToDisplay, Converter converter, ResponseWriter writer) throws IOException {
- writer.startElement("select", uiComponent);
+ writer.startElement("select", component);
writer.writeAttribute("id", clientId, "id");
writer.writeAttribute("name", clientId, null);
writer.writeAttribute("multiple", "true", null);
+ String width = (String) component.getAttributes().get("width");
+ if(width != null) {
+ writer.writeAttribute("style", "width: " + width + ";", null);
+ }
if (size == 0) {
writer.writeAttribute("size", Integer.toString(selectItemsToDisplay.size()), null);
@@ -191,7 +195,7 @@
writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
}
- renderSelectOptions(facesContext, uiComponent, converter, Collections.EMPTY_SET, selectItemsToDisplay);
+ renderSelectOptions(context, component, converter, Collections.EMPTY_SET, selectItemsToDisplay);
writer.writeText("", null);
writer.endElement("select");
}
16 years, 12 months
JBoss Rich Faces SVN: r5110 - trunk/sandbox/ui/combobox/src/main/templates.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2007-12-29 10:44:14 -0500 (Sat, 29 Dec 2007)
New Revision: 5110
Modified:
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
fix layout
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 15:38:45 UTC (rev 5109)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 15:44:14 UTC (rev 5110)
@@ -19,7 +19,7 @@
<f:clientid var="clientId" />
- <div id="comboboxControl#{clientId}" class="rich_cb_width rich_cb_font rich_cb_shell">
+ <div id="#{clientId}" class="rich_cb_width rich_cb_font rich_cb_shell">
<input id="comboboxField#{clientId}" class="rich_cb_width rich_cb_font rich_cb_field" type="text" size="20" autocomplete="off">
</input>
<input readonly="" type="text" value="" class="rich_cb_button rich_cb_font rich_cb_button_bg">
16 years, 12 months
JBoss Rich Faces SVN: r5109 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2007-12-29 10:38:45 -0500 (Sat, 29 Dec 2007)
New Revision: 5109
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
fix layout
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-29 14:54:35 UTC (rev 5108)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-29 15:38:45 UTC (rev 5109)
@@ -74,6 +74,9 @@
},
setValue : function(toSetOnly) {
+ if (!this.comboList.selectedItem) {
+ return;
+ }
var value = this.comboList.selectedItem.innerHTML;
if (toSetOnly) {
this.field.value = value;
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 14:54:35 UTC (rev 5108)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 15:38:45 UTC (rev 5109)
@@ -28,8 +28,10 @@
</input>
<input type="text" class="rich_cb_width rich_cb_strut rich_cb_font">
</input>
- <div id="list#{clientId}" style="display:none" class="rich-combobox-list">
- <f:call name="encodeItems"/>
+ <div id="listParent#{clientId}" style="display:none" class="rich-combobox-list">
+ <div id="list#{clientId}">
+ <f:call name="encodeItems"/>
+ </div>
</div>
</div>
16 years, 12 months
JBoss Rich Faces SVN: r5108 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2007-12-29 09:54:35 -0500 (Sat, 29 Dec 2007)
New Revision: 5108
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
focus handler
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-29 14:20:24 UTC (rev 5107)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-29 14:54:35 UTC (rev 5108)
@@ -12,7 +12,7 @@
this.field = $(fieldId);
this.button = $(buttonId);
- this.defaultMessage = defaultMessage;
+ this.defaultMessage = "Select a state..."; //defaultMessage;
this.onselected = onselected;
@@ -22,7 +22,11 @@
initCombobox : function() {
this.button.observe("click", function(e){this.clickHandler(e);}.bindAsEventListener(this));
this.field.observe("keydown", function(e){this.keyboardManager(e);}.bindAsEventListener(this));
- //this.field.observe("blur", function(e){this.focusHandler(e);}.bindAsEventListener(this));
+
+ this.field.observe("blur", function(e){this.focusHandler(e);}.bindAsEventListener(this));
+ this.field.observe("focus", function(e){this.fieldHandler(e);}.bindAsEventListener(this));
+ this.comboList.listParent.observe("mousedown", function(e){this.listMousedownHandler(e);}.bindAsEventListener(this))
+
this.field.observe("keyup", function(e){this.dataUpdating(e);}.bindAsEventListener(this));
this.comboList.listParent.observe("mousemove", function(e){this.listListener(e)}.bindAsEventListener(this));
@@ -51,6 +55,18 @@
}
},
+ listMousedownHandler : function(e) {
+ this.comboList.isList = true;
+ },
+
+ fieldHandler : function() {
+ if (this.field.value == this.defaultMessage) {
+ this.field.value = "";
+ } else {
+ Richfaces.ComboBox.textboxSelect(this.field, 0, this.field.value.length);
+ }
+ },
+
valueHandler : function(event) {
this.setValue(true);
@@ -93,13 +109,27 @@
}
},
+ /*doForce : function(){
+ if (this.el.dom.value.length > 0) {
+ this.el.dom.value = ((this.lastSelectionText === undefined) ? "" : this.lastSelectionText);
+ this.applyEmptyText();
+ }
+ },*/
+
focusHandler : function(event) {
- this.comboList.hide();
- if (this.field.value == "") {
- this.field.value = this.defaultMessage;
+ if (!this.comboList.isList) {
+ var value = this.field.value;
+ if (value.length == 0) {
+ this.applyDefaultText();
+ }
+ this.comboList.hide();
}
},
+ applyDefaultText : function() {
+ this.field.value = this.defaultMessage;
+ },
+
dataUpdating : function(event) {
if (Richfaces.ComboBox.SPECIAL_KEYS.indexOf(event.keyCode) == -1) {
if (this.filterNewValue) {
@@ -139,6 +169,7 @@
}
this.classes = classes;
+ this.isList = false;
this.selectedItem = null;
@@ -260,6 +291,7 @@
this.normalizeItem(this.selectedItem);
}
this.selectedItem = null;
+ this.isList = false;
},
dataFilter : function(text) {
16 years, 12 months
JBoss Rich Faces SVN: r5107 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2007-12-29 09:20:24 -0500 (Sat, 29 Dec 2007)
New Revision: 5107
Modified:
trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
new mockup update
Modified: trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2007-12-29 14:16:29 UTC (rev 5106)
+++ trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2007-12-29 14:20:24 UTC (rev 5107)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<resource-config>
- <resource class="org.richfaces.renderkit.images.ComboBoxBtnGradient">
+ <resource class="org.richfaces.renderkit.images.ComboBoxButtonGradient">
<name>org.richfaces.renderkit.images.ComboBoxBtnGradient</name>
</resource>
<resource class="org.richfaces.renderkit.images.ComboBoxInputGradient">
<name>org.richfaces.renderkit.images.ComboBoxInputGradient</name>
</resource>
- <resource class="org.richfaces.renderkit.images.ComboBoxImage">
- <name>org.richfaces.renderkit.images.ComboBoxImage</name>
+ <resource class="org.richfaces.renderkit.images.ComboBoxArrowImage">
+ <name>org.richfaces.renderkit.images.ComboBoxArrowImage</name>
</resource>
</resource-config>
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2007-12-29 14:16:29 UTC (rev 5106)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2007-12-29 14:20:24 UTC (rev 5107)
@@ -97,7 +97,7 @@
/*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
<u:selector name=".rich_cb_button_bg">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.images.ComboBoxBtnGradient" />
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" />
</u:style>
</u:selector>
@@ -109,7 +109,7 @@
<u:selector name=".rich_cb_button_arrow">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.images.ComboBoxImage" />
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImage" />
</u:style>
</u:selector>
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 14:16:29 UTC (rev 5106)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 14:20:24 UTC (rev 5107)
@@ -11,7 +11,6 @@
component="org.richfaces.component.UIComboBox">
<h:styles>css/combobox.xcss</h:styles>
- <f:resource name="org.richfaces.renderkit.images.ComboBoxImage" var="combo_img" />
<h:scripts>
new org.ajax4jsf.javascript.PrototypeScript(),
scripts/comboboxUtils.js,
16 years, 12 months