Author: abelevich Date: 2010-12-22 08:56:58 -0500 (Wed, 22 Dec 2010) New Revision: 20742 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml Log: RF-9853, RF-10053 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-12-22 13:01:27 UTC (rev 20741) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-12-22 13:56:58 UTC (rev 20742) @@ -53,11 +53,12 @@ case rf.KEYS.ESC: e.preventDefault(); this.cancel(); + this.onblur(e); break; case rf.KEYS.RETURN: e.preventDefault(); this.save(); - return false; + this.onblur(e); break; } }, Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-12-22 13:01:27 UTC (rev 20741) +++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-12-22 13:56:58 UTC (rev 20742) @@ -64,11 +64,11 @@ <span class="rf-is-shdw-b"></span> <span id="#{clientId}Btn" style="position : relative;"> - <input type="image" name="#{clientId}Okbtn" id="#{clientId}Okbtn" + <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 name="#{clientId}Okbtn" 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'" />