midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2003 Capturing wrong numbers with numeric keypad when decimal separator is not dot / fix problem reported with double comma in windows and certain keyboards

This commit is contained in:
Carlos Ruiz 2018-12-20 14:21:19 +01:00
parent 021eb6d27f
commit fbb5f74389
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
View File

@ -92,32 +92,30 @@ public class NumberBox extends Div
char separatorChar = DisplayType.getNumberFormat(DisplayType.Number, Env.getLanguage(Env.getCtx())).getDecimalFormatSymbols().getDecimalSeparator(); char separatorChar = DisplayType.getNumberFormat(DisplayType.Number, Env.getLanguage(Env.getCtx())).getDecimalFormatSymbols().getDecimalSeparator();
String separator = Character.toString(separatorChar); String separator = Character.toString(separatorChar);
boolean processDotKeypad = MSysConfig.getBooleanValue(MSysConfig.ZK_DECIMALBOX_PROCESS_DOTKEYPAD, true, Env.getAD_Client_ID(Env.getCtx())); boolean processDotKeypad = MSysConfig.getBooleanValue(MSysConfig.ZK_DECIMALBOX_PROCESS_DOTKEYPAD, true, Env.getAD_Client_ID(Env.getCtx()));
if (".".equals(separator))
processDotKeypad = false;
if (processDotKeypad) { if (processDotKeypad) {
StringBuffer funct = new StringBuffer(); StringBuffer funct = new StringBuffer();
funct.append("function(evt)"); funct.append("function(evt)");
funct.append("{"); funct.append("{");
// ignore dot and process it on key up // ignore dot, comma and decimal separator and process them on key down
funct.append(" if (!this._shallIgnore(evt, '0123456789-%").append(separator).append("'))"); funct.append(" if (!this._shallIgnore(evt, '0123456789-%'))");
funct.append(" {"); funct.append(" {");
funct.append(" this.$doKeyPress_(evt);"); funct.append(" this.$doKeyPress_(evt);");
funct.append(" }"); funct.append(" }");
funct.append("}"); funct.append("}");
decimalBox.setWidgetOverride("doKeyPress_", funct.toString()); decimalBox.setWidgetOverride("doKeyPress_", funct.toString());
funct = new StringBuffer(); funct = new StringBuffer();
// not working correctly on opera // debug // funct.append("console.log('keyCode='+event.keyCode);");
funct.append("if (window.event)"); funct.append("if (window.event)");
funct.append(" key = event.keyCode;"); funct.append(" key = event.keyCode;");
funct.append("else"); funct.append("else");
funct.append(" key = event.which;"); funct.append(" key = event.which;");
funct.append("if ((key == 110 || key == 190) && !window.opera) {"); funct.append("if (key == 108 || key == 110 || key == 188 || key == 190 || key == 194) {");
funct.append(" var id = '$'.concat('").append(decimalBox.getId()).append("');"); funct.append(" var id = '$'.concat('").append(decimalBox.getId()).append("');");
funct.append(" var calcText = jq(id)[0];"); funct.append(" var calcText = jq(id)[0];");
funct.append(" calcText.value += '").append(separator).append("';"); funct.append(" calcText.value += '").append(separator).append("';");
funct.append(" event.stop;"); funct.append(" event.stop;");
funct.append("};"); funct.append("};");
decimalBox.setWidgetListener("onKeyUp", funct.toString()); decimalBox.setWidgetListener("onKeyDown", funct.toString());
} }
appendChild(decimalBox); appendChild(decimalBox);