+ Add CNOT Code Structure #5

Author: IDouble

Diff for: index.html

@@ -325,14 +325,14 @@ <h1 class="display-6 h1Options">Options</h1>
                             <button class="button button-2 button-2c" id="divBtn">/</button>
                         </p>
 
+                        
                         <!--
-
                         <p class="col-lg-12 BTNRow">
-                            <button class="button button-2 button-2c" id="ANDBtn">(&) AND</button>
-                            <button class="button button-2 button-2c" id="ORBtn">(|) OR</button>
-                            <button class="button button-2 button-2c" id="XORBtn">(^) XOR</button>
+                        	<!--<button class="button button-2 button-2c" id="CNOTBtn">CNOT</button>
+                            <!--<button class="button button-2 button-2c" id="ANDBtn">(&) AND</button>-->
+                            <!--<button class="button button-2 button-2c" id="ORBtn">(|) OR</button>-->
+                            <!--<button class="button button-2 button-2c" id="XORBtn">(^) XOR</button>--><!--
                         </p>
-
                         -->
 
                     </div>

Diff for: js/scripts.js

@@ -71,6 +71,7 @@ var rechner = (function (rechner) {
         var $mulBtn = $('#mulBtn');
         var $divBtn = $('#divBtn');
 
+        var $CNOTBtn = $('#CNOTBtn');
         var $ANDBtn = $('#ANDBtn');
         var $ORBtn = $('#ORBtn');
         var $XORBtn = $('#XORBtn');
@@ -188,6 +189,9 @@ var rechner = (function (rechner) {
                 else if ($divBtn.hasClass("active")) {
                     trinaryDivision($operand1Trinary, $operand2Trinary);
                 }
+                else if ($CNOTBtn.hasClass("active")) {
+                    trinaryCNOT($operand1Trinary, $operand2Trinary);
+                }
                 else if ($ANDBtn.hasClass("active")) {
                     trinaryAND($operand1Trinary, $operand2Trinary);
                 }
@@ -507,6 +511,33 @@ var rechner = (function (rechner) {
             }
         }
 
+        // CNOT (&)
+
+        function trinaryCNOT(trinaryInputID, trinaryInputID2) {
+
+            if ($operand1Trinary.val() != "" && $operand2Trinary.val() != "") {
+
+                var trinary = trinaryInputID.val();
+                var trinary2 = trinaryInputID2.val();
+                var binAND = "";
+
+                for (var i = 0; i < trinary.length; i++) {
+                    if (trinary.substr(i, 1) == 1) { // Get Each char and check if it's 1
+                        if (trinary2.substr(i, 1) == 1) { // Get Each char of Trinary 2 and check if it's 1, if true replace it by 1
+                            binAND += "1";
+                        } else {
+                            binAND += "0";
+                        }
+                    } else {
+                        binAND += "0";
+                    }
+                }
+
+                $resultTrinary.val(binAND);
+                updateAll($resultDecimal, $resultTrinary, $resultSystem, inputEnum.FunctionalButton);
+            }
+        }
+
         // AND (&)
 
         function trinaryAND(trinaryInputID, trinaryInputID2) {