Merge pull request #667 from victorsl/BUG-7408
BUG 7408 "Fire Fox English/Sumatoria" SOLVED
This commit is contained in:
@@ -3409,7 +3409,7 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
|
||||
|
||||
var strAux = maskNumber.split("").reverse().join("");
|
||||
cont = 0;
|
||||
pos = 0;
|
||||
pos = -1;
|
||||
|
||||
for (i = 0; i <= strAux.length - 1; i++) {
|
||||
if (strAux.charAt(i) == "#") {
|
||||
@@ -3422,26 +3422,35 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
|
||||
}
|
||||
}
|
||||
|
||||
var mask2 = strAux.substring(0, pos + 1);
|
||||
var mask2 = "";
|
||||
|
||||
if (pos != -1) {
|
||||
mask2 = strAux.substring(0, pos + 1);
|
||||
mask2 = mask2.split("").reverse().join("");
|
||||
} else {
|
||||
mask1 = maskNumber;
|
||||
}
|
||||
|
||||
maskNumber = mask1 + mask2;
|
||||
}
|
||||
|
||||
var newNumber = putStringMask(n.split("").reverse().join(""), maskNumber.split("").reverse().join(""));
|
||||
var newDecimal = putStringMask(d, maskDecimal);
|
||||
|
||||
newNumber = newNumber.split("").reverse().join("");
|
||||
var newNumber = putStringMask(n, maskNumber, "reverse");
|
||||
var newDecimal = putStringMask(d, maskDecimal, "forward");
|
||||
|
||||
elem.value = newNumber + decimalSeparator + newDecimal;
|
||||
}
|
||||
|
||||
function putStringMask(str, mask)
|
||||
function putStringMask(str, mask, dir)
|
||||
{
|
||||
var newStr = "";
|
||||
var i1 = 0;
|
||||
var i2 = 0;
|
||||
|
||||
if (dir == "reverse") {
|
||||
str = str.split("").reverse().join("");
|
||||
mask = mask.split("").reverse().join("");
|
||||
}
|
||||
|
||||
for (i1 = 0; i1 <= mask.length - 1; i1++) {
|
||||
switch (mask.charAt(i1)) {
|
||||
case "#":
|
||||
@@ -3460,6 +3469,10 @@ function putStringMask(str, mask)
|
||||
}
|
||||
}
|
||||
|
||||
if (dir == "reverse") {
|
||||
newStr = newStr.split("").reverse().join("");
|
||||
}
|
||||
|
||||
return newStr;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,15 +5,13 @@
|
||||
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
|
||||
{$_header}
|
||||
{literal}
|
||||
<!--[if IE]>
|
||||
<style>
|
||||
table.x-pm-headerbar td, table th {
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
padding-right: 0px;
|
||||
<!--[if lt IE 8]>
|
||||
<style type="text/css">
|
||||
.x-pm-headerbar-data {
|
||||
padding-top: 8px;
|
||||
}
|
||||
</style>
|
||||
<![endif]-->
|
||||
<![endif]-->
|
||||
{/literal}
|
||||
</head>
|
||||
<body>
|
||||
@@ -27,7 +25,7 @@
|
||||
<img src="{$logo_company}" height="40"/>
|
||||
</td>
|
||||
|
||||
<td align="right" valign="top">
|
||||
<td class="x-pm-headerbar-data" align="right" valign="top">
|
||||
<table width="100%" height="25" border="0" cellspacing="0" cellpadding="0" class="headerRightSection">
|
||||
<tr valign="middle">
|
||||
<td align="right">
|
||||
|
||||
Reference in New Issue
Block a user