diff --git a/_includes/binary2.html b/_includes/binary2.html index dd70016c..c9c82a9b 100644 --- a/_includes/binary2.html +++ b/_includes/binary2.html @@ -56,6 +56,9 @@ max="255" onkeypress="return event.charCode >= 48 && event.charCode <= 57" /> +
OR
diff --git a/assets/js/module.js b/assets/js/module.js index 0d2577ee..64077645 100644 --- a/assets/js/module.js +++ b/assets/js/module.js @@ -23,25 +23,54 @@ bit.fill(false); function set_bits() { - if(isNaN(document.getElementById("value_A").value) || document.getElementById("value_A").value > 255 || document.getElementById("value_A").value < 0 || isNaN(document.getElementById("value_B").value) || document.getElementById("value_B").value < 0 || document.getElementById("value_B").value > 255) + var errorEl = document.getElementById("input-error"); + var bit_value; + + if ( + isNaN(document.getElementById("value_A").value) || + document.getElementById("value_A").value > 255 || + document.getElementById("value_A").value < 0 || + isNaN(document.getElementById("value_B").value) || + document.getElementById("value_B").value < 0 || + document.getElementById("value_B").value > 255 + ) { document.getElementById("value_A").value = 0; document.getElementById("value_B").value = 0; - alert("Only numbers between 0 and 255 can be entered."); - set_bits(); + + if (errorEl) { + errorEl.style.display = "block"; + } } else { - for(var i=0; i < 8; i++) + if (errorEl) { + errorEl.style.display = "none"; + } + + for (var i = 0; i < 8; i++) { - if((document.getElementById("value_A").value&Math.pow(2,i))>0) { bit_value = true; } else { bit_value = false; } + if ((document.getElementById("value_A").value & Math.pow(2, i)) > 0) { + bit_value = true; + } else { + bit_value = false; + } + document.getElementById(i).innerHTML = bit_display[bit[i] = bit_value]; - if((document.getElementById("value_B").value&Math.pow(2,i))>0) { bit_value = true; } else { bit_value = false; } - document.getElementById(i+8).innerHTML = bit_display[bit[i+8] = bit_value]; + + if ((document.getElementById("value_B").value & Math.pow(2, i)) > 0) { + bit_value = true; + } else { + bit_value = false; + } + + document.getElementById(i + 8).innerHTML = bit_display[bit[i + 8] = bit_value]; } - do_bitwise(); + + do_bitwise(operator); } } +} function toggle_bit(column) {