Author: vmolotkov Date: 2008-03-30 12:05:20 -0400 (Sun, 30 Mar 2008) New Revision: 7431 Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js Log: the latest changes Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js =================================================================== --- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-03-30 15:31:15 UTC (rev 7430) +++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-03-30 16:05:20 UTC (rev 7431) @@ -76,8 +76,12 @@ tmpValueBlurHandler : function($super, event) { $super(event); + if (!this.byTab) { if (!this.comboList.isList || this.clickOnBar) { + if (this.comboList.activeItem) { + this.comboList.doNormalItem(this.comboList.activeItem); + } this.comboList.hideWithDelay(); } @@ -201,18 +205,13 @@ cancel : function($super, e) { var item = this.getLabelItem(this.valueKeeper.value); - - if (this.comboList.selectedItem) { - this.comboList.doNormalItem(this.comboList.selectedItem); - } -// this.comboList.doSelectItem(item); + this.comboList.resetSelection(); + if (item) { - this.comboList.resetSelection(); this.comboList.doSelectItem(item); $super(e, item.innerHTML); } else { $super(e, ""); - this.comboList.resetSelection(); } this.comboList.hide();