Widget:Unitconversion2 - Bewerkingsoverzicht

Wikilab op 8 sep 2015 om 14:11

2015-09-08T14:11:24Z

Wikilab op 8 sep 2015 om 14:07

2015-09-08T14:07:04Z

Wikilab op 8 sep 2015 om 14:01

2015-09-08T14:01:42Z

Wikilab: Nieuwe pagina aangemaakt met '

@@ Regel 16: / Regel 16: @@
+                 }
                  result=Math.round(unita * dec2) / dec2;
-                 document.formulaForm.unit21.value=result;
+                 document.formulaForm2.unit21.value=result;
                  result=Math.round(unitb * dec2) / dec2;
-                 document.formulaForm.unit22.value=result;
+                 document.formulaForm2.unit22.value=result;
+         }
 // --></script>
-     <form name="formulaForm" id="formulaForm">
+     <form name="formulaForm2" id="formulaForm2">
      <div align="left">
        <table border="0" cellpadding="0" cellspacing="1" align="left">
@@ Regel 42: / Regel 42: @@
            <td rowspan="2"><!--{$unit22|escape:'quotes'}--></td>
-           <td rowspan="2" align="center"><input type="button" name="Calculate" value="Calc" onclick="calculateFormula2(document.formulaForm.unit21.value,document.formulaForm.unit22.value,document.formulaForm.conv2.value,<!--{$dec2|escape:'quotes'}-->)"></td>
+           <td rowspan="2" align="center"><input type="button" name="Calculate" value="Calc" onclick="calculateFormula2(document.formulaForm2.unit21.value,document.formulaForm2.unit22.value,document.formulaForm2.conv2.value,<!--{$dec2|escape:'quotes'}-->)"></td>
            <td rowspan="2" align="center"><input type="reset" name="resetButton" value="Reset"></td>

@@ Regel 8: / Regel 8: @@
                  var conv=parseFloat(c);
                  var resconv= 0;
-                 var dec=Math.pow(10,parseFloat(d));
+                 var dec2=Math.pow(10,parseFloat(d));
                  if  (!isNaN(unita) ) {
                    unitb=unita * conv;
@@ Regel 15: / Regel 15: @@
                    unita=unitb / conv;
+                 }
-                 result=Math.round(unita * dec) / dec;
+                 result=Math.round(unita * dec2) / dec2;
                  document.formulaForm.unit21.value=result;
-                 result=Math.round(unitb * dec) / dec;
+                 result=Math.round(unitb * dec2) / dec2;
                  document.formulaForm.unit22.value=result;
+         }
@@ Regel 34: / Regel 34: @@
            <td>&nbsp;x&nbsp;</td>
-           <td rowspan="2"><input type="text" size="6" name="conv" value="<!--{$conv|escape:'quotes'}-->" readonly></td>
+           <td rowspan="2"><input type="text" size="6" name="conv2" value="<!--{$conv2|escape:'quotes'}-->" readonly></td>
            <td>&nbsp;=&nbsp;</td>
@@ Regel 42: / Regel 42: @@
            <td rowspan="2"><!--{$unit22|escape:'quotes'}--></td>
-           <td rowspan="2" align="center"><input type="button" name="Calculate" value="Calc" onclick="calculateFormula2(document.formulaForm.unit21.value,document.formulaForm.unit22.value,document.formulaForm.conv.value,<!--{$dec|escape:'quotes'}-->)"></td>
+           <td rowspan="2" align="center"><input type="button" name="Calculate" value="Calc" onclick="calculateFormula2(document.formulaForm.unit21.value,document.formulaForm.unit22.value,document.formulaForm.conv2.value,<!--{$dec2|escape:'quotes'}-->)"></td>
            <td rowspan="2" align="center"><input type="reset" name="resetButton" value="Reset"></td>

@@ Regel 2: / Regel 2: @@
 <script language="JavaScript">
 <!--
-         function calculateFormula (a,b,c,d) {
+         function calculateFormula2 (a,b,c,d) {
                  var result= 0;
                  var unita=parseFloat(a);
@@ Regel 42: / Regel 42: @@
            <td rowspan="2"><!--{$unit22|escape:'quotes'}--></td>
-           <td rowspan="2" align="center"><input type="button" name="Calculate" value="Calc" onclick="calculateFormula(document.formulaForm.unit21.value,document.formulaForm.unit22.value,document.formulaForm.conv.value,<!--{$dec|escape:'quotes'}-->)"></td>
+           <td rowspan="2" align="center"><input type="button" name="Calculate" value="Calc" onclick="calculateFormula2(document.formulaForm.unit21.value,document.formulaForm.unit22.value,document.formulaForm.conv.value,<!--{$dec|escape:'quotes'}-->)"></td>
            <td rowspan="2" align="center"><input type="reset" name="resetButton" value="Reset"></td>