On sort le code javascript du code php et on le met dans un fichier js afin de faciliter sa desactivation

This commit is contained in:
Laurent Destailleur 2005-10-31 03:26:37 +00:00
parent 7218062ba3
commit 2a717462a4
2 changed files with 14 additions and 26 deletions

View File

@ -2,7 +2,7 @@
// Pour la fonction de saisi auto des villes
// *****************************************
function PopupPostalCode(postalcode,objectville)
function autofilltownfromzip_PopupPostalCode(postalcode,objectville)
{
var url = 'searchpostalcode.php?cp=' + postalcode + '&targetobject=window.opener.document.formsoc.' + objectville.name;
// alert(url);
@ -10,12 +10,18 @@ function PopupPostalCode(postalcode,objectville)
if((document.window != null) && (!hWnd.opener)) hWnd.opener = document.window;
}
function save_refresh()
function autofilltownfromzip_save_refresh_edit()
{
document.formsoc.action.value="edit";
document.formsoc.submit();
}
function autofilltownfromzip_save_refresh_create()
{
document.formsoc.action.value="create";
document.formsoc.submit();
}
// Pour la saisie des dates par calendrier
// ***************************************

View File

@ -216,24 +216,6 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
print '</div>';
}
if ($conf->global->MAIN_AUTO_FILLTOWNFROMZIP)
{
include("./soc.js.php");
}
print '
<script language="javascript" type="text/javascript">
<!--
function save_refresh()
{
document.formsoc.action.value="create";
document.formsoc.submit();
// location.href = "index.php?action=updateedit";
}
-->
</script>
';
print '<form action="soc.php" method="post" name="formsoc">';
print '<input type="hidden" name="action" value="add">';
@ -269,14 +251,14 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
print '</textarea></td></tr>';
print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'"';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="PopupPostalCode(cp.value,ville)"';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="autofilltownfromzip_PopupPostalCode(cp.value,ville)"';
print '>';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="PopupPostalCode(cp.value,ville)">';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(cp.value,ville)">';
print '</td>';
print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="save_refresh()"':'');
$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="autofilltownfromzip_save_refresh_create()"':'');
print '</td></tr>';
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
@ -489,15 +471,15 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '</textarea></td></tr>';
print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'"';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="PopupPostalCode(cp.value,ville)"';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="autofilltownfromzip_PopupPostalCode(cp.value,ville)"';
print '>';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="PopupPostalCode(cp.value,ville)">';
if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(cp.value,ville)">';
print '</td>';
print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="save_refresh()"':'');
$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="autofilltownfromzip_save_refresh_edit()"':'');
print '</td></tr>';
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';