diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index ce374db8c..fe1319b0f 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -1213,8 +1213,17 @@ function G_Text(form, element, name) if (me.validate == 'Any' && me.mask == '') return true; var pressKey = (window.event)? window.event.keyCode : event.which; - if (pressKey == 107 || pressKey == 187 || pressKey == 191 || pressKey == 192 || pressKey == 172 || pressKey == 171 || pressKey == 226 || pressKey == 220 || pressKey == 226 || pressKey == 0 || pressKey == 221 || pressKey == 222 || pressKey == 186) { - pressKey = 43; + + if (me.validate == "NodeName" && (pressKey == 189 || pressKey == 173)) { + return true; + } + + if (me.validate == "NodeName" && (pressKey == 0 || pressKey == 192 || pressKey == 109)) { + return false; + } + + if (pressKey == 107 || pressKey == 187 || pressKey == 191 || pressKey == 172 || pressKey == 171 || pressKey == 226 || pressKey == 220 || pressKey == 226 || pressKey == 221 || pressKey == 222 || pressKey == 186) { + pressKey = 43; } switch(pressKey){ @@ -1464,6 +1473,14 @@ function G_Text(form, element, name) if (keyCode == 0) return true; } + if (me.browser.name == 'Microsoft Internet Explorer' || me.browser.name == 'Netscape'){ + if (event.preventDefault) { + event.preventDefault(); + } else { + event.returnValue = false; + } + } + if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){ event.returnValue = false; } @@ -2960,6 +2977,7 @@ var validateForm = function(sRequiredFields) { * i.ei