fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-15524

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2014-08-12 10:22:35 -04:00
parent fc423215e2 4ddaf9b2ef
commit ab5800fb48
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/js/form/core/form.js
View File

@@ -1473,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;
}

1
gulliver/js/maborak/core/maborak.js
View File

@@ -1060,6 +1060,7 @@ if(pressKey==46){me.applyMask(256);}
else{me.applyMask(pressKey);}
if(updateOnChange){me.sendOnChange();}}
if(me.browser.name=='Firefox'){if(keyCode==0)return true;}
alert(me.browser.name);if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){alert('explorer1');if(event.preventDefault){alert('***');event.preventDefault();}else{alert('***--***');event.returnValue=false;}}
if(me.browser.name=='Chrome'||me.browser.name=='Safari'){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<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}}