diff options
author | ramon <ramongomez@us.es> | 2018-03-01 11:55:51 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2018-03-01 11:55:51 +0000 |
commit | 3806a31af653699dffd7026331a5a864178bc047 (patch) | |
tree | 2e370e82b0749418dbbd7a73a69ed7fa9ccbf5a8 /admin/WebConsole/asistentes | |
parent | aabc011b17a715be723a50e0d4c49ba4b777c644 (diff) |
#834: Limpiar código JavaScript: terminar instrucciones con ";" y evitar asignaciones duplicadas.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5630 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/asistentes')
6 files changed, 27 insertions, 27 deletions
diff --git a/admin/WebConsole/asistentes/jscripts/CrearImagen.js b/admin/WebConsole/asistentes/jscripts/CrearImagen.js index ebf37155..fcbe1804 100644 --- a/admin/WebConsole/asistentes/jscripts/CrearImagen.js +++ b/admin/WebConsole/asistentes/jscripts/CrearImagen.js @@ -16,7 +16,7 @@ var atributos="dsk="+disco+RC; var tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') + var ochecks=tb_conf.getElementsByTagName('INPUT'); for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked){ var parcod=ochecks[i].value.split("_"); @@ -46,23 +46,23 @@ function comprobar_datos() { tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') - var op=0 + var ochecks=tb_conf.getElementsByTagName('INPUT'); + var op=0; for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked){ op++; var particion=ochecks[i].value.split("_")[0]; despleimagen=document.getElementById("despleimagen_"+particion); - var p=despleimagen.selectedIndex + var p=despleimagen.selectedIndex; if (p==0){ - alert(TbMsg[0]) - despleimagen.focus() + alert(TbMsg[0]); + despleimagen.focus(); return(false) } } } if(op==0){ - alert(TbMsg[1]) + alert(TbMsg[1]); return(false); } return(comprobar_datosejecucion()) diff --git a/admin/WebConsole/asistentes/jscripts/IniciarSesion.js b/admin/WebConsole/asistentes/jscripts/IniciarSesion.js index 05dcc52c..8e30da51 100644 --- a/admin/WebConsole/asistentes/jscripts/IniciarSesion.js +++ b/admin/WebConsole/asistentes/jscripts/IniciarSesion.js @@ -11,7 +11,7 @@ function confirmar(){ if (comprobar_datos()){ // Compone atributos del comando tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') + var ochecks=tb_conf.getElementsByTagName('INPUT'); var particion; for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked){ @@ -33,13 +33,13 @@ function confirmar(){ function comprobar_datos() { tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') - var op=0 + var ochecks=tb_conf.getElementsByTagName('INPUT'); + var op=0; for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked) op++; } if(op==0){ - alert(TbMsg[1]) + alert(TbMsg[1]); return(false); } return(comprobar_datosejecucion()) diff --git a/admin/WebConsole/asistentes/jscripts/InventarioSoftware.js b/admin/WebConsole/asistentes/jscripts/InventarioSoftware.js index aeb8437e..4a1ffef6 100644 --- a/admin/WebConsole/asistentes/jscripts/InventarioSoftware.js +++ b/admin/WebConsole/asistentes/jscripts/InventarioSoftware.js @@ -10,7 +10,7 @@ function confirmar(){ if (comprobar_datos()){ tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') + var ochecks=tb_conf.getElementsByTagName('INPUT'); var particion; for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked){ @@ -31,13 +31,13 @@ //________________________________________________________________________________________________________ function comprobar_datos(){ tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') - var op=0 + var ochecks=tb_conf.getElementsByTagName('INPUT'); + var op=0; for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked) op++; } if(op==0){ - alert(TbMsg[1]) + alert(TbMsg[1]); return(false); } return(comprobar_datosejecucion()); diff --git a/admin/WebConsole/asistentes/jscripts/OrigenesMaster.js b/admin/WebConsole/asistentes/jscripts/OrigenesMaster.js index b7200a8f..62ad01fc 100644 --- a/admin/WebConsole/asistentes/jscripts/OrigenesMaster.js +++ b/admin/WebConsole/asistentes/jscripts/OrigenesMaster.js @@ -26,7 +26,7 @@ function ListarOrigenesMaster(ip) { var ajaxDisplay = document.getElementById('ajaxDiv'); ajaxDisplay.innerHTML = this.responseText; } - } + }; ajaxRequest.open("GET", "includes/asistentes/ListarOrigenesMaster.php?ip=" + ip, true); ajaxRequest.send(); diff --git a/admin/WebConsole/asistentes/jscripts/RestaurarImagen.js b/admin/WebConsole/asistentes/jscripts/RestaurarImagen.js index eb436aeb..80741374 100644 --- a/admin/WebConsole/asistentes/jscripts/RestaurarImagen.js +++ b/admin/WebConsole/asistentes/jscripts/RestaurarImagen.js @@ -13,7 +13,7 @@ var disco=1; // Siempre disco 1 var atributos="dsk="+disco+RC; var tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') + var ochecks=tb_conf.getElementsByTagName('INPUT'); for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked){ var idradio=ochecks[i].id; @@ -62,8 +62,8 @@ function comprobar_datos() { tb_conf=document.getElementById("tabla_conf"); - var ochecks=tb_conf.getElementsByTagName('INPUT') - var op=0 + var ochecks=tb_conf.getElementsByTagName('INPUT'); + var op=0; for(var i=0;i<ochecks.length;i++){ if(ochecks[i].checked){ op++; @@ -71,23 +71,23 @@ despleimagenizda=document.getElementById("despleimagen_"+idradio+"_1"); // Desplegable izda. despleimagendcha=document.getElementById("despleimagen_"+idradio+"_0"); // Desplegable derecha. - var p1=despleimagenizda.selectedIndex // Toma índice seleccionado - var p2=despleimagendcha.selectedIndex // Toma índice seleccionado + var p1=despleimagenizda.selectedIndex; // Toma índice seleccionado + var p2=despleimagendcha.selectedIndex; // Toma índice seleccionado if (p1==0 && p2==0){ - alert(TbMsg[0]) - despleimagenizda.focus() + alert(TbMsg[0]); + despleimagenizda.focus(); return(false) } if (p1==p2){ - alert(TbMsg[6]) - despleimagenizda.focus() + alert(TbMsg[6]); + despleimagenizda.focus(); return(false) } } } if(op==0){ - alert(TbMsg[1]) + alert(TbMsg[1]); return(false); } return(comprobar_datosejecucion()) diff --git a/admin/WebConsole/asistentes/jscripts/asistentes.js b/admin/WebConsole/asistentes/jscripts/asistentes.js index b47e888b..383f19cc 100644 --- a/admin/WebConsole/asistentes/jscripts/asistentes.js +++ b/admin/WebConsole/asistentes/jscripts/asistentes.js @@ -630,7 +630,7 @@ function addGPTPartition(){ table = document.getElementById("particionesGPT"); // Capturamos el numero de particiones, antes incrementamos - document.getElementById("numGPTpartitions").value = parseInt(document.getElementById("numGPTpartitions").value)+1 + document.getElementById("numGPTpartitions").value = parseInt(document.getElementById("numGPTpartitions").value)+1; numPart=document.getElementById("numGPTpartitions").value; partitionRow = table.insertRow(-1); partitionRow.id = "trPartition"+numPart; |