Author: abelevich
Date: 2010-10-18 13:56:04 -0400 (Mon, 18 Oct 2010)
New Revision: 19599
Added:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InputRendererBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js
trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml
trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
trunk/ui/input/ui/src/main/templates/select.template.xml
Log:
add base class for input components, fix id for inplaces, fix bugs with default labels
behavior
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2010-10-18
16:19:23 UTC (rev 19598)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2010-10-18
17:56:04 UTC (rev 19599)
@@ -111,7 +111,5 @@
@Attribute(defaultValue = "rf-sel-lst-cord")
public abstract String getListCss();
-
-
}
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-18
17:56:04 UTC (rev 19599)
@@ -49,6 +49,7 @@
@ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-event.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
+ @ResourceDependency(library = "org.richfaces", name =
"inputBase.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceBase.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceInput.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceInput.ecss") })
@@ -188,28 +189,7 @@
InplaceState inplaceState) {
return (InplaceState.edit != inplaceState) ? HtmlUtil.concatClasses(getEditCss(),
getNoneCss()) : getEditCss();
}
-
- public String getReadyClientId(FacesContext facesContext,
- UIComponent component, InplaceState inplaceState) {
- String clientId = component.getClientId(facesContext);
- return getId(clientId, InplaceState.ready, inplaceState);
- }
-
- public String getChangedClientId(FacesContext facesContext,
- UIComponent component, InplaceState inplaceState) {
- String clientId = component.getClientId(facesContext);
- return getId(clientId, InplaceState.changed, inplaceState);
- }
-
- private String getId(String clientId, InplaceState expect,
- InplaceState current) {
- String result = clientId;
- if (expect != current) {
- result = clientId + ":" + expect;
- }
- return result;
- }
-
+
public void buildScript(ResponseWriter writer, FacesContext facesContext,
UIComponent component, Object additional) throws IOException {
if (!(component instanceof InplaceComponent)) {
@@ -239,10 +219,10 @@
options.put(OPTIONS_NONE_CSS, getNoneCss());
options.put(OPTIONS_CHANGED_CSS, getChangedStateCss());
options.put(OPTIONS_EDIT_CSS, getEditStateCss());
- options.put(OPTIONS_EDIT_CONTAINER, clientId + ":edit");
- options.put(OPTIONS_INPUT, clientId + ":input");
- options.put(OPTIONS_LABEL, clientId + ":label");
- options.put(OPTIONS_FOCUS, clientId + ":focus");
+ options.put(OPTIONS_EDIT_CONTAINER, clientId + "Edit");
+ options.put(OPTIONS_INPUT, clientId + "Input");
+ options.put(OPTIONS_LABEL, clientId + "Label");
+ options.put(OPTIONS_FOCUS, clientId + "Focus");
options.put(OPTIONS_DEFAULT_LABEL, inplaceComponent.getDefaultLabel());
options.put(OPTIONS_SAVE_ON_BLUR, inplaceComponent.isSaveOnBlur());
@@ -250,8 +230,8 @@
options.put(OPTIONS_SHOWCONTROLS, showControls);
if (showControls) {
- options.put(OPTIONS_BUTTON_OK, clientId + ":okbtn");
- options.put(OPTIONS_BUTTON_CANCEL, clientId + ":cancelbtn");
+ options.put(OPTIONS_BUTTON_OK, clientId + "Okbtn");
+ options.put(OPTIONS_BUTTON_CANCEL, clientId + "Cancelbtn");
}
return options;
}
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2010-10-18
17:56:04 UTC (rev 19599)
@@ -48,19 +48,14 @@
@ResourceDependency(name = "richfaces-event.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
@ResourceDependency(name = "richfaces-selection.js"),
+ @ResourceDependency(library = "org.richfaces", name =
"inputBase.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceBase.js"),
@ResourceDependency(library = "org.richfaces", name =
"popup.js"),
@ResourceDependency(library = "org.richfaces", name =
"popupList.js"),
- @ResourceDependency(library = "org.richfaces", name =
"selectList.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceInput.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceSelect.js"),
@ResourceDependency(library = "org.richfaces", name =
"inplaceSelect.ecss") })
public class InplaceSelectRendererBase extends InplaceInputRendererBase {
-
-
- public static final String OPTION_LIST_ITEMS = "items";
-
- public static final String OPTIONS_SELECT_ITEM_VALUE_INPUT =
"selValueInput";
public static final String OPTIONS_VISIBLE = "visible";
@@ -97,13 +92,12 @@
public void addToOptions(FacesContext facesContext, UIComponent component,
Map<String, Object> options, Object additional) {
options.put(PopupConstants.OPTIONS_ITEM_CLASS, "rf-is-opt");
options.put(PopupConstants.OPTIONS_SELECT_ITEM_CLASS, "rf-is-sel");
- options.put(OPTION_LIST_ITEMS, additional);
String clientId = component.getClientId(facesContext);
options.put(PopupConstants.OPTIONS_LIST_CORD, clientId + "List");
options.put(PopupConstants.OPTIONS_LIST_CLASS,
component.getAttributes().get("listCss"));
-
- options.put(OPTIONS_SELECT_ITEM_VALUE_INPUT, clientId + "selValue");
+ options.put(SelectHelper.OPTIONS_SELECT_ITEM_VALUE_INPUT, clientId +
"selValue");
+ options.put(SelectHelper.OPTIONS_LIST_ITEMS, additional);
options.put(OPTIONS_VISIBLE,
component.getAttributes().get("openOnEdit"));
}
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InputRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2010-10-18
17:56:04 UTC (rev 19599)
@@ -36,13 +36,10 @@
* created 23.01.2007
*/
public class InputRendererBase extends AjaxComponentRendererBase {
- protected Class getComponentClass() {
- return UIInput.class;
- }
protected void doDecode(FacesContext context, UIComponent component) {
String clientId = component.getClientId(context);
- Map requestParameterMap = context.getExternalContext().getRequestParameterMap();
+ Map<String, String> requestParameterMap =
context.getExternalContext().getRequestParameterMap();
String newValue = (String) requestParameterMap.get(clientId);
if (null != newValue) {
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java 2010-10-18
16:19:23 UTC (rev 19598)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectHelper.java 2010-10-18
17:56:04 UTC (rev 19599)
@@ -129,6 +129,7 @@
public static String getSelectInputLabel(FacesContext facesContext, UIComponent
component) {
AbstractSelect select = (AbstractSelect) component;
Object value = select.getSubmittedValue();
+ String label = null;
if (value == null) {
value = select.getValue();
if (value != null) {
@@ -136,13 +137,13 @@
facesContext, component);
for (SelectItem item : items) {
if (value.equals(item.getValue())) {
- value = item.getLabel();
+ label = item.getLabel();
}
}
}
}
- return (String) value;
+ return label;
}
}
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java 2010-10-18
17:56:04 UTC (rev 19599)
@@ -41,9 +41,9 @@
@ResourceDependency(name = "richfaces.js"), @ResourceDependency(name =
"jquery.position.js"),
@ResourceDependency(name = "richfaces-event.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
@ResourceDependency(name = "richfaces-selection.js"),
+ @ResourceDependency(library = "org.richfaces", name =
"inputBase.js"),
@ResourceDependency(library = "org.richfaces", name =
"popup.js"),
@ResourceDependency(library = "org.richfaces", name =
"popupList.js"),
- @ResourceDependency(library = "org.richfaces", name =
"selectList.js"),
@ResourceDependency(library = "org.richfaces", name =
"select.js"),
@ResourceDependency(library = "org.richfaces", name =
"select.ecss") })
public class SelectRendererBase extends InputRendererBase {
@@ -59,6 +59,15 @@
public String getSelectInputLabel(FacesContext facesContext, UIComponent component)
{
return SelectHelper.getSelectInputLabel(facesContext, component);
}
+
+ public String getSelectLabel(FacesContext facesContext, UIComponent component) {
+ AbstractSelect select = (AbstractSelect) component;
+ String label = getSelectInputLabel(facesContext, select);
+ if (label == null || "".equals(label.trim())) {
+ label = select.getDefaultLabel();
+ }
+ return label;
+ }
public void encodeItems(FacesContext facesContext, UIComponent component,
List<ClientSelectItem> clientSelectItems)
throws IOException {
@@ -78,25 +87,19 @@
Map<String, Object> options = new HashMap<String, Object>();
options.put(SelectHelper.OPTIONS_SHOWCONTROL, abstractSelect.isShowButton());
options.put(SelectHelper.OPTIONS_LIST_ITEMS, selectItems);
+ options.put(SelectHelper.OPTIONS_SELECT_ITEM_VALUE_INPUT, clientId +
"selValue");
options.put(PopupConstants.OPTIONS_ITEM_CLASS, abstractSelect.getItemCss());
options.put(PopupConstants.OPTIONS_SELECT_ITEM_CLASS,
abstractSelect.getSelectItemCss());
options.put(PopupConstants.OPTIONS_LIST_CLASS, abstractSelect.getListCss());
options.put(PopupConstants.OPTIONS_LIST_CORD, clientId + "List");
+
function.addParameter(clientId);
function.addParameter(options);
writer.write(function.toString());
}
- public String getValue(FacesContext facesContext, UIComponent component) throws
IOException {
- String value = getInputValue(facesContext, component);
- if (value == null || "".equals(value)) {
- value = ((AbstractSelect) component).getDefaultLabel();
- }
- return value;
- }
-
protected String getScriptName() {
return "new RichFaces.ui.Select";
}
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-18
17:56:04 UTC (rev 19599)
@@ -44,10 +44,8 @@
rf.ui.InplaceBase = function(id, options) {
$super.constructor.call(this, id);
- this.attachToDom(id);
- this.namespace = this.getNamespace() || "." +
rf.Event.createNamespace(this.getName(), this.id);
-
- this.editEvent = options.editEvent;
+
+ this.editEvent = options.editEvent;
this.noneCss = options.noneCss;
this.changedCss = options.changedCss;
this.defaultLabel = options.defaultLabel;
@@ -64,7 +62,7 @@
};
- rf.BaseComponent.extend(rf.ui.InplaceBase);
+ rf.ui.InputBase.extend(rf.ui.InplaceBase);
var $super = rf.ui.InplaceBase.$super;
$.extend(rf.ui.InplaceBase.prototype, ( function () {
@@ -77,18 +75,7 @@
};
return {
- getName: function() {
- },
-
- getNamespace: function() {
- },
-
- getValue: function() {
- },
- setValue: function(value){
- },
-
getLabel: function() {
},
@@ -101,9 +88,6 @@
onhide: function() {
},
- getNamespace: function() {
- },
-
isValueSaved: function() {
return this.isSaved;
},
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-10-18
17:56:04 UTC (rev 19599)
@@ -5,21 +5,19 @@
rf.ui.InplaceInput = function(id, options) {
$super.constructor.call(this, id, options);
- this.input = $(document.getElementById(options.input));
+ //rename input id in template (id + "Input")
+
this.label = $(document.getElementById(options.label));
var label = this.label.text();
- var inputLabel = this.input.val();
+ var inputLabel = this.getValue();
this.initialValue = (label == inputLabel) ? label : "";
this.saveOnBlur = options.saveOnBlur;
this.showControls = options.showControls;
- this.input.bind("focus", $.proxy(this.__editHandler, this));
- this.input.bind("change", $.proxy(this.__changeHandler, this));
- this.input.bind("blur", $.proxy(this.__blurHandler, this));
- this.input.bind("keydown", $.proxy(this.__keydownHandler, this));
-
- if(this.showControls) {
+ this.getInput().bind("focus", $.proxy(this.__editHandler, this));
+
+ if(this.showControls) {
this.okbtn = $(document.getElementById(options.okbtn));
this.cancelbtn = $(document.getElementById(options.cancelbtn));
this.okbtn.bind("mousedown", $.proxy(this.__saveBtnHandler,
this));
@@ -88,9 +86,9 @@
},
__setInputFocus: function() {
- this.input.unbind("focus", this.__editHandler);
- this.input.focus();
- this.input.bind("focus", $.proxy(this.__editHandler, this));
+ this.getInput().unbind("focus", this.__editHandler);
+ this.getInput().focus();
+ this.getInput().bind("focus", $.proxy(this.__editHandler,
this));
},
__saveBtnHandler: function(e) {
@@ -102,15 +100,7 @@
this.cancel();
return false;
},
-
- getValue: function() {
- return this.input.val();
- },
-
- setValue: function(value){
- this.input.val(value);
- },
-
+
getLabel: function() {
return this.label.text();
},
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-18
17:56:04 UTC (rev 19599)
@@ -7,18 +7,17 @@
options['attachTo'] = id;
options['attachToBody'] = true;
- this.popupList = new rf.ui.SelectList(options.list, this, options);
+ this.popupList = new rf.ui.PopupList(options.list, this, options);
this.items = options.items;
this.selValueInput = $(document.getElementById(options.selValueInput));
this.openPopup = false;
}
-
- rf.ui.InplaceInput.extend(rf.ui.InplaceSelect);
- $.extend(rf.ui.InplaceSelect, rf.ui.SelectListener);
+ rf.ui.InplaceInput.extend(rf.ui.InplaceSelect);
var $super = rf.ui.InplaceSelect.$super;
+
$.extend(rf.ui.InplaceSelect.prototype, ( function () {
return{
@@ -119,11 +118,7 @@
$super.__keydownHandler.call(this,e);
},
-
- __isButton: function(target) {
-
- },
-
+
__blurHandler: function(e) {
var target = $(e.originalEvent.explicitOriginalTarget);
if(!this.popupList.isPopupList(target)) {
Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js
(rev 0)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js 2010-10-18
17:56:04 UTC (rev 19599)
@@ -0,0 +1,91 @@
+(function (rf) {
+ rf.KEYS = {
+ BACKSPACE: 8,
+ TAB: 9,
+ RETURN: 13,
+ ESC: 27,
+ PAGEUP: 33,
+ PAGEDOWN: 34,
+ LEFT: 37,
+ UP: 38,
+ RIGHT: 39,
+ DOWN: 40,
+ DEL: 46
+ };
+})(RichFaces);
+
+(function ($, rf) {
+
+ rf.ui = rf.ui || {};
+
+ rf.ui.InputBase = function(id, options) {
+ $super.constructor.call(this, id);
+ this.namespace = this.getNamespace() || "." +
rf.Event.createNamespace(this.getName(), this.getId());
+
+ this.id = id;
+ this.input = $(document.getElementById(id + "Input"));
+ this.attachToDom(id);
+
+ this.input.bind("keydown", $.proxy(this.__keydownHandler, this));
+ this.input.bind("blur", $.proxy(this.__blurHandler, this));
+ this.input.bind("change", $.proxy(this.__changeHandler, this));
+ this.input.bind("click", $.proxy(this.__clickHandler, this));
+ this.input.bind("focus", $.proxy(this.__focusHandler, this));
+ };
+
+ rf.BaseComponent.extend(rf.ui.InputBase);
+ var $super = rf.ui.InputBase.$super;
+
+ $.extend(rf.ui.InputBase.prototype, ( function () {
+
+ return {
+
+ name : "inputBase",
+
+ getName: function() {
+ return this.name;
+ },
+
+ getNamespace: function() {
+ return this.namespace;
+ },
+
+ __focusHandler: function(e) {
+
+ },
+
+ __clickHandler: function(e) {
+ },
+
+ __keydownHandler: function(e) {
+ },
+
+ __blurHandler: function(e) {
+ },
+
+ __changeHandler: function(e) {
+ },
+
+ __setInputFocus: function() {
+ this.input.focus();
+ },
+
+ getValue: function() {
+ return this.input.val();
+ },
+
+ setValue: function(value){
+ this.input.val(value);
+ },
+
+ getInput: function() {
+ return this.input;
+ },
+
+ getId: function() {
+ return this.id;
+ }
+ }
+ })());
+
+})(jQuery, window.RichFaces);
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2010-10-18
16:19:23 UTC (rev 19598)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2010-10-18
17:56:04 UTC (rev 19599)
@@ -1,3 +1,21 @@
+//TODO: to the utils?
+(function (rf) {
+ rf.KEYS = {
+ BACKSPACE: 8,
+ TAB: 9,
+ RETURN: 13,
+ ESC: 27,
+ PAGEUP: 33,
+ PAGEDOWN: 34,
+ LEFT: 37,
+ UP: 38,
+ RIGHT: 39,
+ DOWN: 40,
+ DEL: 46
+ };
+})(RichFaces);
+
+
(function ($, rf) {
rf.ui = rf.ui || {};
@@ -3,4 +21,5 @@
rf.ui.Select = function(id, options) {
+ $super.constructor.call(this, id);
this.id = id;
@@ -10,22 +29,16 @@
options['attachToBody'] = true;
this.selValueInput = $(document.getElementById(options.selValueInput));
-
- this.input = $(document.getElementById(id+"Input"));
- this.input.bind("click", $.proxy(this.__clickHandler, this));
- this.input.bind("keydown", $.proxy(this.__keydownHandler, this));
- this.input.bind("blur", $.proxy(this.__blurHandler, this));
-
this.items = options.items;
if(options.showControl) {
this.btn = $(document.getElementById(id+"Button"));
this.btn.bind("click", $.proxy(this.__clickHandler, this));
}
- this.popupList = new rf.ui.SelectList(options.list, this, options);
+ this.popupList = new rf.ui.PopupList(options.list, this, options);
};
- rf.BaseComponent.extend(rf.ui.Select);
+ rf.ui.InputBase.extend(rf.ui.Select);
var $super = rf.ui.Select.$super;
$.extend(rf.ui.Select.prototype, ( function () {
@@ -75,10 +88,6 @@
}
}
},
-
- __setInputFocus: function() {
- this.input.focus();
- },
__blurHandler: function(e) {
var target = $(e.originalEvent.explicitOriginalTarget);
@@ -119,11 +128,7 @@
saveItemValue: function(value) {
this.selValueInput.val(value);
- },
-
- setValue: function(value){
- this.input.val(value);
- }
+ }
}
})());
Modified: trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-10-18 16:19:23 UTC
(rev 19598)
+++ trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-10-18 17:56:04 UTC
(rev 19599)
@@ -43,34 +43,34 @@
<cdk:object type="java.lang.String" name="inplaceValue"
value="#{getValue(facesContext, component)}" />
<span id="#{clientId}" class="#{getStateStyleClass(component,
inplaceState)}" cdk:passThroughWithExclusions="id class">
- <span id="#{clientId}:label" class="rf-ii-lbl">
+ <span id="#{clientId}Label" class="rf-ii-lbl">
#{inplaceValue}
</span>
<c:if test="#{!isDisable(inplaceState)}">
- <input id="#{clientId}:focus" type="image"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
class="rf-ii-none"/>
- <span id="#{clientId}:edit" class="#{getEditStyleClass(component,
inplaceState)}">
- <input id="#{clientId}:input" autocomplete="off"
name="#{clientId}"
+ <input id="#{clientId}Focus" type="image"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
class="rf-ii-none"/>
+ <span id="#{clientId}Edit" class="#{getEditStyleClass(component,
inplaceState)}">
+ <input id="#{clientId}Input" autocomplete="off"
name="#{clientId}"
type="text" value="#{getInputValue(facesContext,
component)}" class="rf-ii-fld" style="width:
#{component.attributes['inputWidth']};"
cdk:passThrough="tabIndex">
<cdk:call expression="renderInputHandlers(facesContext,
component);"/>
</input>
<c:if test="#{component.attributes['showControls']}">
<span class="rf-ii-btn-prepos">
<span class="rf-ii-btn-pos">
- <span id="#{clientId}:btnshadow"
class="rf-ii-btn-shadow">
+ <span id="#{clientId}Btnshadow"
class="rf-ii-btn-shadow">
<span class="rf-ii-btn-shdw-t"></span>
<span class="rf-ii-btn-shdw-l"></span>
<span class="rf-ii-btn-shdw-r"></span>
<span class="rf-ii-btn-shdw-b"></span>
- <span id="#{clientId}:btn" style="position :
relative">
+ <span id="#{clientId}Btn" style="position :
relative">
<input type="image"
- id="#{clientId}:okbtn"
+ id="#{clientId}Okbtn"
src="#{getResourcePath(facesContext,
'org.richfaces/ico_ok.gif')}"
class="rf-ii-btn"
onmousedown="this.className='rf-ii-btn-p'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'" />
<input type="image"
- id="#{clientId}:cancelbtn"
+ id="#{clientId}Cancelbtn"
src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}"
class="rf-ii-btn"
onmousedown="this.className='rf-ii-btn-press'"
onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'" />
Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-18 16:19:23
UTC (rev 19598)
+++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-18 17:56:04
UTC (rev 19599)
@@ -40,16 +40,16 @@
<span id="#{clientId}" class="#{getStateStyleClass(component,
inplaceState)}"
cdk:passThroughWithExclusions="id class">
- <span id="#{clientId}:label" class="rf-is-lbl">
+ <span id="#{clientId}Label" class="rf-is-lbl">
#{inplaceValue}
</span>
<c:if test="#{!isDisable(inplaceState)}">
- <input id="#{clientId}:focus" type="image"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
class="rf-is-none" />
+ <input id="#{clientId}Focus" type="image"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
class="rf-is-none" />
- <span id="#{clientId}:edit" class="#{getEditStyleClass(component,
inplaceState)}">
+ <span id="#{clientId}Edit" class="#{getEditStyleClass(component,
inplaceState)}">
<input id="#{clientId}selValue" name="#{clientId}"
type="hidden" value="#{getValue(facesContext, component)}"/>
- <input id="#{clientId}:input" autocomplete="off"
+ <input id="#{clientId}Input" autocomplete="off"
type="text" value="#{getSelectInputLabel(facesContext,
component)}"
class="rf-is-fld" style="width:
#{component.attributes['inputWidth']};" readonly="readonly"
cdk:passThrough="tabIndex">
@@ -58,18 +58,18 @@
<c:if test="#{component.attributes['showControls']}">
<span class="rf-is-btn-prepos">
<span class="rf-is-btn-pos">
- <span id="#{clientId}:btnshadow" class="rf-is-shdw">
+ <span id="#{clientId}Btnshadow" class="rf-is-shdw">
<span class="rf-is-shdw-t"></span>
<span class="rf-is-shdw-l"></span>
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
- <span id="#{clientId}:btn" style="position :
relative;">
- <input type="image" id="#{clientId}:okbtn"
+ <span id="#{clientId}Btn" style="position :
relative;">
+ <input type="image" id="#{clientId}Okbtn"
src="#{getResourcePath(facesContext,
'org.richfaces/ico_ok.gif')}"
class="rf-is-btn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'" />
- <input type="image" id="#{clientId}:cancelbtn"
+ <input type="image" id="#{clientId}Cancelbtn"
src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}"
class="rf-is-btn"
onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'"
onmouseup="this.className='rf-is-btn'" />
Modified: trunk/ui/input/ui/src/main/templates/select.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/select.template.xml 2010-10-18 16:19:23 UTC (rev
19598)
+++ trunk/ui/input/ui/src/main/templates/select.template.xml 2010-10-18 17:56:04 UTC (rev
19599)
@@ -21,10 +21,10 @@
<div id="#{clientId}" class="rf-sel-fld">
<div style="position : relative; overflow : hidden; text-align :
left; padding-right : 21px;">
- <input id="#{clientId}selValue" name="#{clientId}"
type="hidden" value="#{getValue(facesContext, component)}"/>
+ <input id="#{clientId}selValue" name="#{clientId}"
type="hidden" value="#{getInputValue(facesContext, component)}"/>
<input cdk:passThroughWithExclusions="class autocomplete id value
disabled name type readonly"
id="#{clientId}Input"
- value="#{getSelectInputLabel(facesContext, component)}"
+ value="#{getSelectLabel(facesContext, component)}"
disabled="#{disabled}"
type="text"
class="rf-sel-fnt rf-sel-inp"