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

Merge pull request #667 from victorsl/BUG-7408

Browse Source 
BUG 7408 "Fire Fox English/Sumatoria" SOLVED
This commit is contained in:
julceslauhub
2012-10-05 10:35:08 -07:00
parent 450fd34865 f68a5ea074
commit 0ea42390de
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3409,7 +3409,7 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
var strAux = maskNumber.split("").reverse().join(""); var strAux = maskNumber.split("").reverse().join("");
cont = 0; cont = 0;
pos = 0; pos = -1;
for (i = 0; i <= strAux.length - 1; i++) { for (i = 0; i <= strAux.length - 1; i++) {
if (strAux.charAt(i) == "#") { if (strAux.charAt(i) == "#") {
@@ -3422,26 +3422,35 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
} }
} }
var mask2 = strAux.substring(0, pos + 1); var mask2 = "";
mask2 = mask2.split("").reverse().join("");
if (pos != -1) {
mask2 = strAux.substring(0, pos + 1);
mask2 = mask2.split("").reverse().join("");
} else {
mask1 = maskNumber;
}
maskNumber = mask1 + mask2; maskNumber = mask1 + mask2;
} }
var newNumber = putStringMask(n.split("").reverse().join(""), maskNumber.split("").reverse().join("")); var newNumber = putStringMask(n, maskNumber, "reverse");
var newDecimal = putStringMask(d, maskDecimal); var newDecimal = putStringMask(d, maskDecimal, "forward");
newNumber = newNumber.split("").reverse().join("");
elem.value = newNumber + decimalSeparator + newDecimal; elem.value = newNumber + decimalSeparator + newDecimal;
} }
function putStringMask(str, mask) function putStringMask(str, mask, dir)
{ {
var newStr = ""; var newStr = "";
var i1 = 0; var i1 = 0;
var i2 = 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++) { for (i1 = 0; i1 <= mask.length - 1; i1++) {
switch (mask.charAt(i1)) { switch (mask.charAt(i1)) {
case "#": case "#":
@@ -3460,6 +3469,10 @@ function putStringMask(str, mask)
} }
} }
if (dir == "reverse") {
newStr = newStr.split("").reverse().join("");
}
return newStr; return newStr;
} }

24
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -5,15 +5,13 @@
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
{$_header} {$_header}
{literal} {literal}
<!--[if IE]> <!--[if lt IE 8]>
<style> <style type="text/css">
table.x-pm-headerbar td, table th { .x-pm-headerbar-data {
padding-top: 5px; padding-top: 8px;
padding-bottom: 5px;
padding-right: 0px;
} }
</style> </style>
<![endif]--> <![endif]-->
{/literal} {/literal}
</head> </head>
<body> <body>
@@ -21,18 +19,18 @@
<div id="panel-header" /> <div id="panel-header" />
<div id="header-content" style="display:none"> <div id="header-content" style="display:none">
<table class="x-pm-headerbar"> <table class="x-pm-headerbar">
<tr> <tr>
<td width="50%" valign="middle"> <td width="50%" valign="middle">
<img src="{$logo_company}" height="40"/> <img src="{$logo_company}" height="40"/>
</td> </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"> <table width="100%" height="25" border="0" cellspacing="0" cellpadding="0" class="headerRightSection">
<tr valign="middle"> <tr valign="middle">
<td align="right"> <td align="right">
{if $licenseNotification != ''} {if $licenseNotification != ''}
<span class="x-pm-license-notification"> <span class="x-pm-license-notification">
<img src="/images/alert_icon.gif" width="10px" headerRightSection="10px"/> {$licenseNotification} <img src="/images/alert_icon.gif" width="10px" headerRightSection="10px"/> {$licenseNotification}
</span> </span>
{/if} {/if}
@@ -40,15 +38,15 @@
<td height="12" valign="middle" align="right" valign="top"> <td height="12" valign="middle" align="right" valign="top">
<a href="#" id="options-tool" class="options-tool"> <a href="#" id="options-tool" class="options-tool">
{$userfullname} {$userfullname}
<span> <span>
<img src="/images/classic/roll.static.gif" width="10px" headerRightSection="10px"/> <img src="/images/classic/roll.static.gif" width="10px" headerRightSection="10px"/>
</span> </span>
<br /> <br />
<span style="font-size:9px">{$rolename}</span> <span style="font-size:9px">{$rolename}</span>
</a> </a>
</td> </td>
<td width="40" align="right"> <td width="40" align="right">
<span id="user-avatar"> <span id="user-avatar">
<img src="{$user_avatar}" width="25" height="25"/> <img src="{$user_avatar}" width="25" height="25"/>
</span> </span>
</td> </td>