diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index 30878c613..8f2992042 100644 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -1480,7 +1480,7 @@ function G_Text(form, element, name) } } - if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){ + if (me.browser.name == 'Chrome' || me.browser.name == 'Safari' || me.browser.name == 'Firefox'){ event.returnValue = false; } else{ diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index 324f9723e..e3c7f3d4d 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -999,7 +999,7 @@ else{me.applyMask(pressKey);} if(updateOnChange){me.sendOnChange();}} if(me.browser.name=='Firefox'){if(keyCode==0)return true;} if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(window.event.preventDefault){window.event.preventDefault();}else{window.event.returnValue=false;}} -if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;} +if(me.browser.name=='Chrome'||me.browser.name=='Safari'||me.browser.name=='Firefox'){event.returnValue=false;} else{return false;}}};if(this.element){this.element.onblur=function(event) {var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}} var partsMaskSep=aMasks[m].split(separatorField);if(partsMaskSep.length==2){var countDecimal=0;txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]=='#'){countDecimal++;} diff --git a/workflow/engine/methods/scheduler/index.php b/workflow/engine/methods/scheduler/index.php index 0b870e7f0..e57bbfc40 100755 --- a/workflow/engine/methods/scheduler/index.php +++ b/workflow/engine/methods/scheduler/index.php @@ -1,3 +1,7 @@ +