Author: pyaschenko
Date: 2011-01-21 07:48:28 -0500 (Fri, 21 Jan 2011)
New Revision: 21143
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
Log:
http://jira.jboss.com/jira/browse/RF-10117
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2011-01-21
12:08:56 UTC (rev 21142)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2011-01-21
12:48:28 UTC (rev 21143)
@@ -280,10 +280,10 @@
}
scrollToSelectedItem.call(this);
if (event &&
- event.which != rf.KEYS.BACKSPACE &&
- event.which != rf.KEYS.DEL &&
- event.which != rf.KEYS.LEFT &&
- event.which != rf.KEYS.RIGHT) {
+ event.keyCode != rf.KEYS.BACKSPACE &&
+ event.keyCode != rf.KEYS.DEL &&
+ event.keyCode != rf.KEYS.LEFT &&
+ event.keyCode != rf.KEYS.RIGHT) {
autoFill.call(this, this.value, getSelectedItemValue.call(this));
}
};
@@ -317,13 +317,13 @@
if (this.items.length!=0 && callback) {
callback.call(this, event);
}
- if (event.which == rf.KEYS.RETURN || event.type == "click") {
+ if (event.keyCode == rf.KEYS.RETURN || event.type == "click") {
this.__setInputValue(subValue);
} else if (this.options.selectFirst) {
selectItem.call(this, event, 0);
}
} else {
- if (event.which == rf.KEYS.RETURN || event.type == "click") {
+ if (event.keyCode == rf.KEYS.RETURN || event.type == "click") {
this.__setInputValue(subValue);
}
if (subValue.length>=this.options.minChars) {
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2011-01-21
12:08:56 UTC (rev 21142)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2011-01-21
12:48:28 UTC (rev 21143)
@@ -40,7 +40,7 @@
inputEventHandlers["focus"+this.namespace] = onFocus;
inputEventHandlers["blur"+this.namespace] = onBlur;
inputEventHandlers["click"+this.namespace] = onClick;
- inputEventHandlers[($.browser.opera ? "keypress" :
"keydown")+this.namespace] = onKeyDown;
+ inputEventHandlers[($.browser.opera || $.browser.mozilla ? "keypress" :
"keydown")+this.namespace] = onKeyDown;
inputEventHandlers["change"+this.namespace] = function (event) {if
(this.focused) {event.stopPropagation()}};
rf.Event.bindById(this.fieldId, inputEventHandlers, this);
@@ -111,7 +111,7 @@
var flag = value != this.currentValue;
//TODO: is it needed to chesk keys?
//TODO: we need to set value when autoFill used when LEFT or RIGHT was pressed
- if (event.which == rf.KEYS.LEFT || event.which == rf.KEYS.RIGHT || flag) {
+ if (event.keyCode == rf.KEYS.LEFT || event.keyCode == rf.KEYS.RIGHT || flag) {
if (flag) {
this.currentValue = this.getValue();
this.__onChangeValue(event, undefined, (!this.isVisible ? this.show : undefined));
@@ -131,7 +131,7 @@
};
var onKeyDown = function (event) {
- switch(event.which) {
+ switch(event.keyCode) {
case rf.KEYS.UP:
event.preventDefault();
if (this.isVisible) {