Author: abelevich
Date: 2008-08-06 10:44:19 -0400 (Wed, 06 Aug 2008)
New Revision: 9954
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/inplaceselectlist.js
Log:
https://jira.jboss.org/jira/browse/RF-3441,
https://jira.jboss.org/jira/browse/RF-3909
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-08-06
14:12:28 UTC (rev 9953)
+++
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-08-06
14:44:19 UTC (rev 9954)
@@ -67,17 +67,18 @@
},
buttonClickHandler : function(e) {
+ this.button.isClicked = true;
this.tempKeeperClickHandler();
this.tempValueKeeper.focus();
- this.button.isClicked = true;
Event.stop(e);
},
tmpValueBlurHandler : function($super, event) {
- if (this.clickOnBar || this.byTab) {
+ if (this.clickOnBar || this.byTab || (Richfaces.browser.isIE &&
this.button.isClicked)) {
//tab navigation&clickOnbar handler
this.clickOnBar = false;
this.byTab = false;
+ this.button.isClicked = false;
return;
}
@@ -93,6 +94,7 @@
return;
}*/
this.comboList.hideWithDelay();
+
}
if (this.clickOnScroll) {
@@ -103,13 +105,12 @@
return;
}
- if (!this.attributes.showControls) {
+ if (!this.attributes.showControls) {
this.save();
} else {
this.applyTmpValue();
}
this.comboList.isList = false;
-
},
listClickHandler : function(event) {
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
===================================================================
---
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2008-08-06
14:12:28 UTC (rev 9953)
+++
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2008-08-06
14:44:19 UTC (rev 9954)
@@ -94,10 +94,8 @@
if( listWidth == this.list.offsetWidth) {
listWidth = listWidth- Richfaces.getScrollWidth(this.list);
}
-
- if (Prototype.Browser.Gecko) {
- listWidth = listWidth - (Richfaces.getBorderWidth(item,"lr") +
Richfaces.getPaddingWidth(item,"lr") +
Richfaces.getMarginWidth(item,"lr"));
- }
+
+ listWidth = listWidth - (Richfaces.getBorderWidth(item,"lr") +
Richfaces.getPaddingWidth(item,"lr") +
Richfaces.getMarginWidth(item,"lr"));
item.style.width = listWidth + "px";
},