JBoss Rich Faces SVN: r6368 - in trunk/test-applications/qa/Performance Suite/DataModels: comboBox and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-02-27 09:30:17 -0500 (Wed, 27 Feb 2008)
New Revision: 6368
Added:
trunk/test-applications/qa/Performance Suite/DataModels/comboBox/
trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.java
trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.jsp
trunk/test-applications/qa/Performance Suite/DataModels/comboBox/ComboboxProperty.jsp
Log:
Added: trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.java
===================================================================
--- trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.java (rev 0)
+++ trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.java 2008-02-27 14:30:17 UTC (rev 6368)
@@ -0,0 +1,245 @@
+package combobox;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.SelectItem;
+
+import util.data.Data;
+
+public class Combobox {
+ public boolean disabled;
+ public String defaultLabel;
+ public boolean filterNewValues;
+ public String hideDelay;
+ public boolean directInputSuggestions;
+ public boolean immediate;
+ public int inputSize;
+ public String width;
+ public String value;
+ public int tabindex;
+ public List<String> suggestionValues;
+ public int size;
+ public String showDelay;
+ public boolean required;
+ public String requiredMessage;
+ public boolean rendered;
+ public boolean selectFirstOnUpdate;
+ public int maxlength;
+ public boolean enableManualInput;
+ public String listHeight;
+ public String listWidth;
+ public ArrayList<SelectItem> selectItem;
+
+ public Combobox() {
+ this.disabled = false;
+ this.defaultLabel = "defaultLabel";
+ this.filterNewValues = false;
+ this.hideDelay = "100";
+ this.directInputSuggestions = true;
+ this.immediate = false;
+ this.inputSize = 4;
+ this.width = "300";
+ this.value = "";
+ this.tabindex = 2;
+ this.size = 5;
+ this.showDelay = "200";
+ this.required = false;
+ this.requiredMessage = "requiredMessage";
+ this.rendered = true;
+ this.selectFirstOnUpdate = true;
+ this.maxlength = 5;
+ this.enableManualInput = true;
+ this.listHeight = "400";
+ this.listWidth = "350";
+ this.suggestionValues = new ArrayList<String>();
+ this.selectItem = new ArrayList<SelectItem>();
+ Random r = new Random();
+ for(int i = 0; i < 10; i++){
+ suggestionValues.add("suggestionValues " + r.nextInt(10) + " N=" + i);
+ selectItem.add(new SelectItem("selectItem " + r.nextInt(10) + " N=" + i));
+ }
+ }
+
+ public ArrayList<SelectItem> getSelectItem() {
+ return selectItem;
+ }
+
+ public void setSelectItem(ArrayList<SelectItem> selectItem) {
+ this.selectItem = selectItem;
+ }
+
+ public void valueChangeListener(ValueChangeEvent event) {
+ System.out.println(event.getNewValue());
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public String getDefaultLabel() {
+ return defaultLabel;
+ }
+
+ public void setDefaultLabel(String defaultLabel) {
+ this.defaultLabel = defaultLabel;
+ }
+
+ public String getHideDelay() {
+ return hideDelay;
+ }
+
+ public void setHideDelay(String hideDelay) {
+ this.hideDelay = hideDelay;
+ }
+
+ public boolean isDirectInputSuggestions() {
+ return directInputSuggestions;
+ }
+
+ public void setDirectInputSuggestions(boolean directInputSuggestions) {
+ this.directInputSuggestions = directInputSuggestions;
+ }
+
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+
+ public int getInputSize() {
+ return inputSize;
+ }
+
+ public void setInputSize(int inputSize) {
+ this.inputSize = inputSize;
+ }
+
+ public String getWidth() {
+ return width;
+ }
+
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public int getTabindex() {
+ return tabindex;
+ }
+
+ public void setTabindex(int tabindex) {
+ this.tabindex = tabindex;
+ }
+
+ public List<String> getSuggestionValues() {
+ return suggestionValues;
+ }
+
+ public void setSuggestionValues(List<String> suggestionValues) {
+ this.suggestionValues = suggestionValues;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public boolean isFilterNewValues() {
+ return filterNewValues;
+ }
+
+ public void setFilterNewValues(boolean filterNewValues) {
+ this.filterNewValues = filterNewValues;
+ }
+
+ public String getShowDelay() {
+ return showDelay;
+ }
+
+ public void setShowDelay(String showDelay) {
+ this.showDelay = showDelay;
+ }
+
+ public boolean isRequired() {
+ return required;
+ }
+
+ public void setRequired(boolean required) {
+ this.required = required;
+ }
+
+ public String getRequiredMessage() {
+ return requiredMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public boolean isSelectFirstOnUpdate() {
+ return selectFirstOnUpdate;
+ }
+
+ public void setSelectFirstOnUpdate(boolean selectFirstOnUpdate) {
+ this.selectFirstOnUpdate = selectFirstOnUpdate;
+ }
+
+ public int getMaxlength() {
+ return maxlength;
+ }
+
+ public void setMaxlength(int maxlength) {
+ this.maxlength = maxlength;
+ }
+
+ public boolean isEnableManualInput() {
+ return enableManualInput;
+ }
+
+ public void setEnableManualInput(boolean enableManualInput) {
+ this.enableManualInput = enableManualInput;
+ }
+
+ public String getListHeight() {
+ return listHeight;
+ }
+
+ public void setListHeight(String listHeight) {
+ this.listHeight = listHeight;
+ }
+
+ public String getListWidth() {
+ return listWidth;
+ }
+
+ public void setListWidth(String listWidth) {
+ this.listWidth = listWidth;
+ }
+}
Added: trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.jsp
===================================================================
--- trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.jsp (rev 0)
+++ trunk/test-applications/qa/Performance Suite/DataModels/comboBox/Combobox.jsp 2008-02-27 14:30:17 UTC (rev 6368)
@@ -0,0 +1,25 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+
+<f:subview id="comboboxSubviewID">
+ <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}" defaultLabel="#{combobox.defaultLabel}"
+ filterNewValues="#{combobox.filterNewValues}"
+ directInputSuggestions="#{combobox.directInputSuggestions}" immediate="#{combobox.immediate}" inputSize="#{combobox.inputSize}"
+ width="#{combobox.width}" valueChangeListener="#{combobox.valueChangeListener}" value="#{combobox.value}"
+ tabindex="#{combobox.tabindex}" suggestzionValues="#{combobox.suggestionValues}" size="#{combobox.size}"
+ required="#{combobox.required}" requiredMessage="#{combobox.requiredMessage}"
+ rendered="#{combobox.rendered}" selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}" maxlength="#{combobox.maxlength}"
+ enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}"
+ onblur="#{event.onblur}" onchange="#{event.onchange}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onfocus="#{event.onfocus}" onitemselected="#{event.onitemselected}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
+ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onselect="#{event.onselect}">
+ <f:selectItem itemValue="selectItem 1"/>
+ <f:selectItem itemValue="selectItem 2"/>
+ <f:selectItem itemValue="selectItem 3"/>
+ <f:selectItems value="#{combobox.selectItem}"/>
+ </rich:comboBox>
+
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/qa/Performance Suite/DataModels/comboBox/ComboboxProperty.jsp
===================================================================
--- trunk/test-applications/qa/Performance Suite/DataModels/comboBox/ComboboxProperty.jsp (rev 0)
+++ trunk/test-applications/qa/Performance Suite/DataModels/comboBox/ComboboxProperty.jsp 2008-02-27 14:30:17 UTC (rev 6368)
@@ -0,0 +1,62 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="comboboxPropertySubviewID">
+ <h:panelGrid columns="2">
+ <h:outputText value="defaultLabel"></h:outputText>
+ <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="filterNewValues"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.filterNewValues}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="inputSize"></h:outputText>
+ <h:inputText value="#{combobox.inputSize}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="value"></h:outputText>
+ <h:inputText value="#{combobox.value}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="tabindex"></h:outputText>
+ <h:inputText value="#{combobox.tabindex}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="maxlength"></h:outputText>
+ <h:inputText value="#{combobox.maxlength}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="width"></h:outputText>
+ <h:inputText value="#{combobox.width}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="size"></h:outputText>
+ <h:inputText value="#{combobox.size}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="listHeight"></h:outputText>
+ <h:inputText value="#{combobox.listHeight}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="listWidth"></h:outputText>
+ <h:inputText value="#{combobox.listWidth}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="enableManualInput"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.enableManualInput}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="selectFirstOnUpdate"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.selectFirstOnUpdate}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="directInputSuggestions"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.directInputSuggestions}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="disabled"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.disabled}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="rendered"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.rendered}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="immediate"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.immediate}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="required"></h:outputText>
+ <h:selectBooleanCheckbox value="#{combobox.required}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="requiredMessage"></h:outputText>
+ <h:inputText value="#{combobox.requiredMessage}" onchange="submit();"></h:inputText>
+ </h:panelGrid>
+</f:subview>
\ No newline at end of file
17 years, 10 months
JBoss Rich Faces SVN: r6367 - Suite and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-02-27 09:27:08 -0500 (Wed, 27 Feb 2008)
New Revision: 6367
Modified:
trunk/test-applications/qa/Performance Suite/Performance Test Suite Blank 3.2.0 (1).doc
Log:
Modified: trunk/test-applications/qa/Performance Suite/Performance Test Suite Blank 3.2.0 (1).doc
===================================================================
(Binary files differ)
17 years, 10 months
JBoss Rich Faces SVN: r6366 - trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-27 08:12:37 -0500 (Wed, 27 Feb 2008)
New Revision: 6366
Modified:
trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
Log:
remove unnecessary imports
Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-27 12:42:05 UTC (rev 6365)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-27 13:12:37 UTC (rev 6366)
@@ -8,9 +8,6 @@
import javax.faces.convert.Converter;
import org.ajax4jsf.javascript.JSFunctionDefinition;
-import org.ajax4jsf.javascript.JSReference;
-import org.ajax4jsf.javascript.ScriptString;
-import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
import org.ajax4jsf.util.InputUtils;
import org.apache.commons.logging.Log;
17 years, 10 months
JBoss Rich Faces SVN: r6365 - in trunk/sandbox/ui/inplaceInput/src/main: java/org/richfaces/renderkit and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-27 07:42:05 -0500 (Wed, 27 Feb 2008)
New Revision: 6365
Modified:
trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
code review fixes
Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-27 12:35:37 UTC (rev 6364)
+++ trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-27 12:42:05 UTC (rev 6365)
@@ -154,7 +154,7 @@
<description></description>
</property>
<property>
- <name>changedClass</name>
+ <name>changeClass</name>
<classname>java.lang.String</classname>
<description></description>
</property>
@@ -169,7 +169,7 @@
<description></description>
</property>
<property>
- <name>changedHoverClass</name>
+ <name>changeHoverClass</name>
<classname>java.lang.String</classname>
<description></description>
</property>
@@ -208,8 +208,7 @@
<name>oninputclick</name>
<classname>java.lang.String</classname>
<description>HTML: a script expression; a pointer button is clicked</description>
-
- </property>
+ </property>
<property>
<name>oninputdblclick</name>
<classname>java.lang.String</classname>
Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-27 12:35:37 UTC (rev 6364)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-27 12:42:05 UTC (rev 6365)
@@ -28,7 +28,36 @@
private static Log logger = LogFactory.getLog(InplaceInputBaseRenderer.class);
private static final String CONTROLS_FACET = "controls";
-
+
+ private static final int NORMAL_KEY = 0;
+
+ private static final int HOVERED_KEY = 1;
+
+ private static final int EDITABLE_KEY = 2;
+
+ private static final String INPLACE_COMPONENT = "COMPONENT";
+
+ private static final String INPLACE_CHANGED = "CHANGED";
+
+ private static final String INPLACE_VIEW = "VIEW";
+
+ private static final String INPLACE_EDITABLE = "EDITABLE";
+
+ private static final String INPLACE_NORMAL = "NORMAL";
+
+ private static final String INPLACE_HOVERED = "HOVERED";
+
+ private static final String INPLACE_CSS_PUBLIC = "rich-inplace";
+
+ private static final String INPLACE_CSS_VIEW = "view";
+
+ private static final String INPLACE_CSS_EDITABLE = "edit";
+
+ private static final String INPLACE_CSS_CHANGE = "change";
+
+ private static final String INPLACE_CSS_HOVER = "hover";
+
+
protected Class<UIInplaceInput> getComponentClass() {
return UIInplaceInput.class;
@@ -42,12 +71,9 @@
} else {
if (logger.isDebugEnabled()) {
- //FIXME: from Maksim
- //That's no ComboBox but Inplace input!
-
logger.debug("No decoding necessary since the component "
+ component.getId() +
- " is not an instance or a sub class of UIComboBox");
+ " is not an instance or a sub class of UIInplaceInput");
}
return;
}
@@ -79,32 +105,125 @@
}
}
- //FIXME: from Maksim --> I think this method should check if facet is rendered as well
public boolean isControlsFacetExists(FacesContext context, UIComponent component) {
UIComponent facet = component.getFacet(CONTROLS_FACET);
- if (facet != null) {
+ if (facet != null && facet.isRendered()) {
return true;
}
return false;
}
+ public String encodeScriptAttributes(FacesContext context, UIComponent component) {
+ StringBuffer attributes = new StringBuffer();
+ attributes.append("var attributes = ");
+
+ ScriptOptions options = new ScriptOptions(component);
+ options.addOption("defaultLabel");
+ options.addOption("showControls");
+ options.addOption("applyFromControlsOnly");
+ options.addOption("editEvent");
+ options.addOption("selectOnEdit");
+ options.addOption("verticalPosition");
+ options.addOption("horizontalPosition");
+ options.addOption("inputWidth");
+ options.addOption("inputMinWidth");
+ options.addOption("inputMaxWidth");
+ attributes.append(options.toScript());
+
+ return attributes.toString();
+ }
+
+ public String encodeScriptEvents(FacesContext context, UIComponent component) {
+ StringBuffer events = new StringBuffer();
+
+ events.append("var events = ");
+ ScriptOptions options = new ScriptOptions(component);
+ options.addOption("oneditactivation", getAsEventHandler(context, component, "oneditactivation"));
+ options.addOption("onviewactivation",getAsEventHandler(context, component, "onviewactivation"));
+ options.addOption("oneditactivated",getAsEventHandler(context, component, "oneditactivated"));
+ options.addOption("onviewactivated",getAsEventHandler(context, component, "onviewactivated"));
+ events.append(options.toScript());
+
+ return events.toString();
+ }
+ public String encodeInplaceInputCss(FacesContext context, UIComponent component) {
+ StringBuffer cssMap = new StringBuffer();
+ cssMap.append("var classes = ");
+
+ ScriptOptions mainMap = new ScriptOptions(component);
+ ScriptOptions componentClasses = new ScriptOptions(component);
+ ScriptOptions changedClasses = new ScriptOptions(component);
+ ScriptOptions viewClasses = new ScriptOptions(component);
+
+ changedClasses.addOption(INPLACE_NORMAL, buildCss(component, NORMAL_KEY, INPLACE_CSS_CHANGE) );
+ changedClasses.addOption(INPLACE_HOVERED, buildCss(component, HOVERED_KEY, INPLACE_CSS_CHANGE));
+
+ viewClasses.addOption(INPLACE_NORMAL, buildCss(component, NORMAL_KEY, INPLACE_CSS_VIEW) );;
+ viewClasses.addOption(INPLACE_HOVERED, buildCss(component, HOVERED_KEY, INPLACE_CSS_VIEW));
+
+ componentClasses.addOption(INPLACE_CHANGED,changedClasses);
+ componentClasses.addOption(INPLACE_VIEW, viewClasses);
+ componentClasses.addOption(INPLACE_EDITABLE,buildCss(component, EDITABLE_KEY, INPLACE_CSS_EDITABLE));
+
+ mainMap.addOption(INPLACE_COMPONENT, componentClasses);
+ cssMap.append(mainMap.toString());
+ return cssMap.toString();
+ }
+
+ private String buildCss(UIComponent component, int key, String suffix) {
+ Object value;
+ StringBuffer stringBuffer = new StringBuffer();
+ switch (key) {
+ case NORMAL_KEY:
+ stringBuffer.append(INPLACE_CSS_PUBLIC);
+ stringBuffer.append(" ");
+ stringBuffer.append(INPLACE_CSS_PUBLIC + "-" + suffix);
+ value = component.getAttributes().get(suffix + "Class");
+ if (value != null) {
+ stringBuffer.append(" ");
+ stringBuffer.append(value);
+ }
+ break;
+ case HOVERED_KEY:
+ stringBuffer.append(INPLACE_CSS_PUBLIC + "-" + "input-" + suffix + "-" + INPLACE_CSS_HOVER);
+ value = component.getAttributes().get(suffix + "HoverClass");
+ if (value != null) {
+ stringBuffer.append(" ");
+ stringBuffer.append(value);
+ }
+ break;
+
+ case EDITABLE_KEY:
+ stringBuffer.append(INPLACE_CSS_PUBLIC);
+ stringBuffer.append(" ");
+ stringBuffer.append(INPLACE_CSS_PUBLIC + "-" + suffix);
+ value = component.getAttributes().get(suffix + "Class");
+ if (value != null) {
+ stringBuffer.append(" ");
+ stringBuffer.append(value);
+ }
+ break;
+ }
+ return stringBuffer.toString();
+ }
+
public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) {
- String event = (String) component.getAttributes().get(attributeName);
- ScriptString result = JSReference.NULL;
+ String event = (String) component.getAttributes().get(attributeName);
+ String result = null;
+
+ if (event != null) {
+ event = event.trim();
+
+ if (event.length() != 0) {
+ JSFunctionDefinition function = new JSFunctionDefinition();
+ function.addParameter("event");
+ function.addToBody(event);
- if (event != null) {
- event = event.trim();
-
- if (event.length() != 0) {
- JSFunctionDefinition function = new JSFunctionDefinition();
- function.addParameter("event");
- function.addToBody(event);
-
- result = function;
+ result = function.toScript();
+ }
}
- }
- return ScriptUtils.toScript(result);
+ return result;
}
protected String getConvertedStringValue(FacesContext context, UIInplaceInput component, Object value) {
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-27 12:35:37 UTC (rev 6364)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-27 12:42:05 UTC (rev 6365)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<f:template xmlns:f='http:/jsf.exadel.com/template'
+
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml" >
@@ -8,7 +9,7 @@
.rich-inplace {
}
- .rich-inplace-changed {
+ .rich-inplace-change {
background-position:left top;
background-repeat:no-repeat;
}
@@ -32,7 +33,7 @@
}
.rich-inplace-input-view-hover {
- border: thin solid red;
+ color: blue;
}
.rich-inplace-input-change-hover {
@@ -41,6 +42,7 @@
.rich-inplace-input-strut {
height : 1px;
+ position: absolute;
}
.rich-inplace-button {
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-27 12:35:37 UTC (rev 6364)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-27 12:42:05 UTC (rev 6365)
@@ -68,16 +68,22 @@
*/
inplaceMouseOverHandler : function(e) {
+ var className = this.inplaceInput.className;
if (this.currentState == Richfaces.InplaceInput.STATES[0]) {
- this.inplaceInput.className += " " + this.classes.COMPONENT.VIEW.HOVERED;
+ if (className.indexOf(this.classes.COMPONENT.VIEW.HOVERED) == -1) {
+ className += " " + this.classes.COMPONENT.VIEW.HOVERED;
+ }
} else if (this.currentState == Richfaces.InplaceInput.STATES[2]) {
- this.inplaceInput.className += " " + this.classes.COMPONENT.CHANGED.HOVERED;
+ if (className.indexOf(this.classes.COMPONENT.CHANGED.HOVERED) == -1) {
+ className += " " + this.classes.COMPONENT.CHANGED.HOVERED;
+ }
}
+ this.inplaceInput.className = className;
},
inplaceMouseOutHandler : function(e) {
if (this.currentState == Richfaces.InplaceInput.STATES[0]) {
- this.inplaceInput.className = this.classes.COMPONENT.VIEW.NORMAL;
+ this.inplaceInput.className = this.classes.COMPONENT.VIEW.NORMAL;
} else if (this.currentState == Richfaces.InplaceInput.STATES[2]) {
this.inplaceInput.className = this.classes.COMPONENT.CHANGED.NORMAL;
}
Modified: trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-27 12:35:37 UTC (rev 6364)
+++ trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-27 12:42:05 UTC (rev 6365)
@@ -25,10 +25,8 @@
<f:clientid var="clientId" />
<jsp:scriptlet>
<![CDATA[
- //FIXME: from Maksim --> why get same attribute twice?
- //This is UIInput, so better call getValue() directly. It's 10x faster
- Object value = component.getAttributes().get("value");
- Object fieldValue = component.getAttributes().get("value");
+ Object value = component.getValue();
+ Object fieldValue = value;
value = getConvertedStringValue(context, component,value);
if (value == null) {
fieldValue = "";
@@ -50,13 +48,12 @@
variables.setVariable("cancelIcon", cancelIcon);
}
- //FIXME: from Maksim --> Check spelling, in English control is with single L
- String controllClass = (String)component.getAttributes().get("controllClass");
- variables.setVariable("controllClass", controllClass);
- String controllHoveredClass = (String)component.getAttributes().get("controllHoverClass");
- variables.setVariable("controllHoverClass", controllHoveredClass);
- String controllPressedClass = (String)component.getAttributes().get("controllPressedClass");
- variables.setVariable("controllPressedClass", controllPressedClass);
+ String controlClass = (String)component.getAttributes().get("controlClass");
+ variables.setVariable("controlClass", controlClass);
+ String controlHoveredClass = (String)component.getAttributes().get("controlHoverClass");
+ variables.setVariable("controlHoverClass", controlHoveredClass);
+ String controlPressedClass = (String)component.getAttributes().get("controlPressedClass");
+ variables.setVariable("controlPressedClass", controlPressedClass);
]]>
</jsp:scriptlet>
@@ -119,6 +116,7 @@
</tbody>
</table>
</div>
+
<div id="#{clientId}buttons" style="position:relative;">
<input id='#{clientId}ok' class='rich-inplace-button #{controlClass}'
type='image'
@@ -143,33 +141,14 @@
</div>
#{value}
</span>
+
+
<script type="text/javascript">
- //TODO: from Maksim --> I suggest you to change this code to use JavaScriptOption class
- //Constructor can be created from java code
-
- var attributes = {defaultLabel : '#{component.attributes["defaultLabel"]}',
- showControls : #{component.attributes["showControls"]},
- applyFromControlsOnly : #{component.attributes["applyFromControlsOnly"]},
- editEvent : '#{component.attributes["editEvent"]}',
- selectOnEdit : #{component.attributes["selectOnEdit"]},
- verticalPosition : '#{component.attributes["controlsPosition"]}',
- horizontalPosition : '#{component.attributes["controlsHorizontalAlign"]}',
- inputWidth : '#{component.attributes["inputWidth"]}',
- inputMinWidth : '#{component.attributes["minInputWidth"]}',
- inputMaxWidth : '#{component.attributes["maxInputWidth"]}'
- };
- var events = {oneditactivation : #{this:getAsEventHandler(context, component, "oneditactivation")},
- onviewactivation : #{this:getAsEventHandler(context, component, "onviewactivation")},
- oneditactivated : #{this:getAsEventHandler(context, component, "oneditactivated")},
- onviewactivated : #{this:getAsEventHandler(context, component, "onviewactivated")}};
-
- //Global variable? HMMM...
- Richfaces.InplaceInput.CLASSES = {
- COMPONENT : {CHANGED : {NORMAL : 'rich-inplace rich-inplace-changed #{component.attributes["changedClass"]}', HOVERED : 'rich-inplace-input-change-hover #{component.attributes["changedHoverClass"]}'},
- VIEW : {NORMAL : 'rich-inplace rich-inplace-view #{component.attributes["viewClass"]}', HOVERED : 'rich-inplace-input-view-hover #{component.attributes["viewHoverClass"]}'},
- EDITABLE : 'rich-inplace rich-inplace-edit #{component.attributes["editClass"]}'}
- };
-
- var inplaceInput = new Richfaces.InplaceInput('#{clientId}', '#{clientId}tempValue', '#{clientId}value', '#{clientId}tabber', '#{clientId}strut', attributes, events, Richfaces.InplaceInput.CLASSES, ['#{clientId}bar', '#{clientId}ok', '#{clientId}cancel', '#{clientId}buttons','#{clientId}btns_shadow']);
+
+ #{this:encodeScriptAttributes(context, component)};
+ #{this:encodeScriptEvents(context, component)};
+ #{this:encodeInplaceInputCss(context, component)};
+
+ var inplaceInput = new Richfaces.InplaceInput('#{clientId}', '#{clientId}tempValue', '#{clientId}value', '#{clientId}tabber', '#{clientId}strut', attributes, events, classes, ['#{clientId}bar', '#{clientId}ok', '#{clientId}cancel', '#{clientId}buttons','#{clientId}btns_shadow']);
</script>
</f:root>
\ No newline at end of file
17 years, 10 months
JBoss Rich Faces SVN: r6364 - Suite and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-02-27 07:35:37 -0500 (Wed, 27 Feb 2008)
New Revision: 6364
Added:
trunk/test-applications/qa/Performance Suite/Performance Test Suite Blank 3.2.0 (1).doc
Removed:
trunk/test-applications/qa/Performance Suite/Performance Test Suite 19022008.doc
Log:
Deleted: trunk/test-applications/qa/Performance Suite/Performance Test Suite 19022008.doc
===================================================================
(Binary files differ)
Added: trunk/test-applications/qa/Performance Suite/Performance Test Suite Blank 3.2.0 (1).doc
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Performance Suite/Performance Test Suite Blank 3.2.0 (1).doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 10 months
JBoss Rich Faces SVN: r6363 - in trunk/ui/dataTable/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-27 06:18:19 -0500 (Wed, 27 Feb 2008)
New Revision: 6363
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
Log:
Inputs for filter value. Some optimization.
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-27 09:16:36 UTC (rev 6362)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-27 11:18:19 UTC (rev 6363)
@@ -515,13 +515,13 @@
boolean isSingleSortMode = !"multi".equals(table.getSortMode());
for (Iterator<UIComponent> iterator = list.iterator(); iterator
.hasNext();) {
- UIComponent children = iterator.next();
- if (children instanceof org.richfaces.component.UIColumn) {
- org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) children;
- children.setId(children.getId());
+ UIComponent child = iterator.next();
+ if (child instanceof org.richfaces.component.UIColumn) {
+ org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) child;
+ child.setId(child.getId());
if (clientId != null) {
- if (clientId.equals(children.getClientId(context))) {
- String id = children.getId();
+ if (clientId.equals(child.getClientId(context))) {
+ String id = child.getId();
Collection<Object> sortPriority = table.getSortPriority();
if (isSingleSortMode) {
sortPriority.clear();
@@ -534,14 +534,14 @@
column.setSortOrder(Ordering.UNSORTED);
}
}
- String filterValue = map.get(children.getClientId(context) + SORT_FILTER_PARAMETER +
- "value");
- if (filterValue == null) {
- filterValue = map.get(children.getClientId(context) + SORT_FILTER_PARAMETER);
+ UIInput filterValueInput = (UIInput)child.getFacet(FILTER_INPUT_FACET_NAME);
+ if (null != filterValueInput) {
+ filterValueInput.decode(context);
+ Object submittedValue = filterValueInput.getSubmittedValue();
+ if (null != submittedValue) {
+ column.setFilterValue(filterValueInput.getSubmittedValue().toString());
+ }
}
- if (filterValue != null) {
- column.setFilterValue(filterValue);
- }
}
}
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-27 09:16:36 UTC (rev 6362)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-27 11:18:19 UTC (rev 6363)
@@ -16,7 +16,6 @@
<h:scripts>
new org.ajax4jsf.javascript.AjaxScript(),
new org.ajax4jsf.javascript.PrototypeScript(),
- /org/richfaces/renderkit/html/scripts/inplaceinput.js,
/org/richfaces/renderkit/html/scripts/data-table.js
</h:scripts>
<f:clientid var="clientId"/>
17 years, 10 months
JBoss Rich Faces SVN: r6362 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-27 04:16:36 -0500 (Wed, 27 Feb 2008)
New Revision: 6362
Modified:
trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
code style refactoring
Modified: trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-27 09:16:36 UTC (rev 6362)
@@ -100,6 +100,7 @@
<name>maxFilesQuantity</name>
<classname>java.lang.Integer</classname>
<description>Defines max files count allowed for upload (optional).</description>
+ <defaultvalue>1</defaultvalue>
</property>
<property>
<name>addButtonClass</name>
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -2,8 +2,6 @@
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
@@ -14,9 +12,7 @@
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import javax.faces.render.ResponseStateManager;
import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.context.AjaxContextImpl;
@@ -32,7 +28,6 @@
import org.richfaces.component.UIProgressBar;
import org.richfaces.event.UploadEvent;
import org.richfaces.org.jboss.seam.ui.component.UIFileUpload;
-import org.richfaces.org.jboss.seam.web.MultipartFilter;
import org.richfaces.org.jboss.seam.web.MultipartRequest;
import org.richfaces.renderkit.TemplateEncoderRendererBase;
@@ -83,12 +78,13 @@
* @param fileUpload
* @param file
*/
+ @SuppressWarnings("unchecked")
private void storeData(FacesContext context, UIFileUpload fileUpload, File file) {
ValueExpression data = fileUpload.getValueExpression("data");
if (data != null) {
Class clazz = data.getType(context.getELContext());
if (clazz.isAssignableFrom(Map.class)) {
- Map map = (Map) data.getValue(context.getELContext());
+ Map<String, File> map = (Map<String, File>) data.getValue(context.getELContext());
map.put(fileUpload.getLocalFileName(), file);
}
}
@@ -130,6 +126,7 @@
* @return
* @throws IOException
*/
+ @SuppressWarnings("unchecked")
private String getActionScript(FacesContext context, UIComponent component,
String action, Object oncomplete) throws IOException {
JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(
@@ -264,45 +261,6 @@
}
/**
- * Finds an instance of MultipartRequest wrapped within a request or its
- * (recursively) wrapped requests.
- */
- private static ServletRequest unwrapMultipartRequest(ServletRequest request) {
- while (!(request instanceof MultipartRequest)) {
- boolean found = false;
-
- for (Method m : request.getClass().getMethods()) {
- if (ServletRequest.class.isAssignableFrom(m.getReturnType())
- && m.getParameterTypes().length == 0) {
- try {
- request = (ServletRequest) m.invoke(request);
- found = true;
- break;
- } catch (Exception ex) { /* Ignore, try the next one */
- }
- }
- }
-
- if (!found) {
- for (Field f : request.getClass().getDeclaredFields()) {
- if (ServletRequest.class.isAssignableFrom(f.getType())) {
- try {
- request = (ServletRequest) f.get(request);
- } catch (Exception ex) { /* Ignore */
- }
- }
- }
- }
-
- if (!found)
- break;
- }
-
- return request;
- }
-
-
- /**
* Gets progress bar Id
* @param context
* @param component
@@ -355,13 +313,6 @@
if (null == progressBar) {
progressBar = createProgressBar(context, component);
}
-
- //We associate progress bar's percent value in session scope with file upload component id
-// String exprStr = "#{" + MultipartFilter.PERCENT_BEAN_NAME + "['"+component.getClientId(context)+"']}";
-// ValueExpression ex = context.getApplication().getExpressionFactory()
-// .createValueExpression(context.getELContext(), exprStr,
-// Integer.class);
- //progressBar.getAttributes().put("value", 0);
progressBar.getAttributes().put("minValue", -1);
progressBar.getAttributes().put("enabled", false);
progressBar.setTransient(false);
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/FileUploadException.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -7,6 +7,10 @@
*/
public class FileUploadException extends RuntimeException
{
+
+ private static final long serialVersionUID = 3142473677581995262L;
+
+
public FileUploadException()
{
this(null, null);
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartFilter.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -32,8 +32,10 @@
{
public static final String MULTIPART = "multipart/";
+ /** Session bean name where multipart requests map will be stored */
public static final String REQUESTS_SESSIONS_BEAN_NAME = "_richfaces_upload_sessions";
+ /** Session bean name where progress bar's percent map will be stored */
public static final String PERCENT_BEAN_NAME = "_richfaces_upload_percents";
/**
@@ -66,7 +68,8 @@
this.maxRequestSize = maxFileSize;
}
- public void doFilter(ServletRequest request, ServletResponse response,
+ @SuppressWarnings("unchecked")
+public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
if (!(response instanceof HttpServletResponse)) {
chain.doFilter(request, response);
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-27 09:16:36 UTC (rev 6362)
@@ -240,10 +240,7 @@
private HttpServletRequest request;
- private long time;
-
- //private ProgressData progressData = null;
- private boolean shouldStop = false;
+ private boolean shouldStop = false;
public MultipartRequest(HttpServletRequest request,
boolean createTempFiles, int maxRequestSize, String uid) {
@@ -443,7 +440,7 @@
}
private byte[] getBoundaryMarker(String contentType) {
- Map<String, Object> params = parseParams(contentType, ";");
+ Map<String, String> params = parseParams(contentType, ";");
String boundaryStr = (String) params.get("boundary");
if (boundaryStr == null)
@@ -484,13 +481,13 @@
private static final Pattern FILE_NAME_PATTERN = Pattern
.compile(".*filename=\"(.*)\"");
- private Map parseParams(String paramStr, String separator) {
+ private Map<String, String> parseParams(String paramStr, String separator) {
Map<String, String> paramMap = new HashMap<String, String>();
parseParams(paramStr, separator, paramMap);
return paramMap;
}
- private void parseParams(String paramStr, String separator, Map paramMap) {
+ private void parseParams(String paramStr, String separator, Map<String, String> paramMap) {
String[] parts = paramStr.split(separator);
for (String part : parts) {
Modified: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-26 20:43:11 UTC (rev 6361)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-27 09:16:36 UTC (rev 6362)
@@ -66,13 +66,13 @@
</div>
</div>
<div class="upload_button_border" style=" float:left;">
- <div class="upload_button upload_font #{component.attributes['uploadButtonClassDisabled']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
+ <div class="upload_button upload_font #{component.attributes['uploadButtonClass']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
onmouseout="this.className='upload_button upload_font'"
id="#{clientId}:upload1"
style="display: none"
onclick="return $('#{clientId}').component.upload();">
<a href="#" class="upload_button_selection">
- <div class="upload_button_content upload_font upload_ico upload_ico_start_dis #{component.attributes['uploadButtonClassDisabled']}"
+ <div class="upload_button_content upload_font upload_ico upload_ico_start #{component.attributes['uploadButtonClass']}"
id="#{clientId}:upload2">
<b>Upload</b>
</div>
@@ -85,13 +85,13 @@
<!-- -->
<div class="upload_button_border" style=" float:right">
- <div class="upload_button_dis upload_font #{component.attributes['cleanButtonClassDisabled']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
+ <div class="upload_button upload_font #{component.attributes['cleanButtonClass']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
onmouseout="this.className='upload_button upload_font'"
onclick="return $('#{clientId}').component.clear();"
id="#{clientId}:clean1"
style="display: none">
<a href="#" class="upload_button_selection">
- <div class="upload_button_content upload_font upload_ico upload_ico_clear_dis #{component.attributes['cleanButtonClassDisabled']}"
+ <div class="upload_button_content upload_font upload_ico upload_ico_clear_dis #{component.attributes['cleanButtonClass']}"
id="#{clientId}:clean2">Clear All</div>
</a>
</div>
17 years, 10 months
JBoss Rich Faces SVN: r6361 - management/design/standardComponent.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-02-26 15:43:11 -0500 (Tue, 26 Feb 2008)
New Revision: 6361
Modified:
management/design/standardComponent/Func-Spec-StdControls.doc
Log:
Std Controls spec. updated to 0.1 version
Modified: management/design/standardComponent/Func-Spec-StdControls.doc
===================================================================
(Binary files differ)
17 years, 10 months
JBoss Rich Faces SVN: r6360 - management/design/standardComponent.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-02-26 15:20:43 -0500 (Tue, 26 Feb 2008)
New Revision: 6360
Added:
management/design/standardComponent/Func-Spec-StdControls.doc
Log:
Std Controls spec. committed
Added: management/design/standardComponent/Func-Spec-StdControls.doc
===================================================================
(Binary files differ)
Property changes on: management/design/standardComponent/Func-Spec-StdControls.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 10 months
JBoss Rich Faces SVN: r6359 - trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-02-26 14:10:45 -0500 (Tue, 26 Feb 2008)
New Revision: 6359
Modified:
trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
Log:
latest changes
Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-02-26 19:08:23 UTC (rev 6358)
+++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-02-26 19:10:45 UTC (rev 6359)
@@ -9,7 +9,7 @@
initHandlers : function($super) {
$super();
this.tempValueKeeper.observe("click", function(e){this.tempKeeperClickHandler(e);}.bindAsEventListener(this));
- this.tempValueKeeper.observe("keydown", function(e){this.tmpValueKeyDownHandler(e);}.bindAsEventListener(this));
+ this.tempValueKeeper.observe("keydown", function(e){this.tmpValueKeyDownHandlerIn(e);}.bindAsEventListener(this));
this.comboList.listParent.observe("mousedown", function(e){this.listMousedownHandler(e);}.bindAsEventListener(this));
this.comboList.listParent.observe("mousemove", function(e){this.listMouseMoveHandler(e)}.bindAsEventListener(this));
@@ -69,7 +69,7 @@
}
},
- tmpValueKeyDownHandler : function(event) {
+ tmpValueKeyDownHandlerIn : function(event) {
switch (event.keyCode) {
case Event.KEY_RETURN :
this.inputProcessing();
@@ -78,9 +78,11 @@
break;
case Event.KEY_DOWN :
this.comboList.moveActiveItem(event);
+ Event.stop(event);
break;
case Event.KEY_UP :
this.comboList.moveActiveItem(event);
+ Event.stop(event);
break;
case Event.KEY_ESC :
this.comboList.hideWithDelay();
17 years, 10 months