closer

rcmiller · Aug 12, 2013 · b00e335 · b00e335
1 parent 5ee1d4c
commit b00e335
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 49 deletions.
diff --git a/perfectSteak.html b/perfectSteak.html
diff --git a/perfectSteak.js b/perfectSteak.js
@@ -258,7 +258,7 @@ var perfectSteak = function (div) {
         var clicked = false;
         var displayDiv = $("<div class='displayDiv'></div>");
         var tableTabs = $('<ul class="nav nav-tabs"><li><a href="#table" data-toggle="tab">Table</a></li><li><a href="#text" data-toggle="tab">Text</a></li></ul>');
-        var tabContent = $("<div class='tab-content'><div class='tab-pane active' id='table'><table class='inputTable table table-striped'><tr><th class='inpTabHeader'>Duration (m:s)</th><th class='inpTabHeader'>Side 1 (&#176;C)</th><th class='inpTabHeader'>Side 2 (&#176;C)</th></tr></table></div><div class='tab-pane' id='text'><div class='container'><input type='text' id='recipeInput'></input></div></div></div>");
+        var tabContent = $("<div class='tab-content'><div class='tab-pane active' id='table'><span class='switcheroo'><input type='radio' class='mytog2' id='C' name='toggle2' checked><label for='C' class='btn' >C</label><input type='radio' class='mytog2'id='F' name='toggle2'><label for='F' class='btn' >F</label></span><span id='thickInpDiv'>Meat Thickness: <input type='text' id='thicknessInp' value='3'> cm </span><span id='tempInpDiv'>Initial Meat Temperature: <input type='text' id='steakTemp' value='23'><span id='work'>&#176;C</span></span><span><form id='meatInp'><b>Meat Type  </b><input type='radio' name='meat' id='Steak' checked>Steak<input type='radio' name='meat' id='Tuna'>Tuna <input type='radio' name='meat' id='Turkey'>Turkey </form></span><table class='inputTable table table-striped'><tr><th class='inpTabHeader'>Duration (m:s)</th><th class='inpTabHeader'>Side 1 (&#176;C)</th><th class='inpTabHeader'>Side 2 (&#176;C)</th></tr></table></div><div class='tab-pane' id='text'><div class='container'><input type='text' id='recipeInput'></input></div></div></div>");
         displayDiv.append(tableTabs, tabContent);
 
         var addButton;
@@ -327,17 +327,12 @@ var perfectSteak = function (div) {
             if (model.currentInfo["OKToGraph"]) {
                 div.append("<div class='row'><div class='container optionBar'></div></div><div class='span3'><div class='container table-container' id='theTable'></div></div><div class='span9'></div></div>");
                 var switches = $('<div class="switch"><input type="radio" class="mytog" id="PS" name="toggle" checked><label for="PS" class="btn" >Protein State</label><input type="radio" class="mytog"id="T" name="toggle"><label for="T" class="btn" >Temperature</label></div>');
-                var CF = $('<span class="switcheroo"><input type="radio" class="mytog2" id="C" name="toggle2" checked><label for="C" class="btn" >C</label><input type="radio" class="mytog2"id="F" name="toggle2"><label for="F" class="btn" >F</label></span>');
-                var mThick = $('<span id="thickInpDiv">Meat Thickness: <input type="text" id="thicknessInp" value="3"> cm </span>');
-                var mTemp = $('<span id="tempInpDiv">Initial Meat Temperature: <input type="text" id="steakTemp" value="23"><span id="work">&#176;C</span></span>');
-                var mType = $('<span><form id="meatInp"><b>Meat Type  </b><input type="radio" name="meat" id="Steak" checked>Steak ' + '<input type="radio" name="meat" id="Tuna">Tuna <input type="radio" name="meat" id="Turkey">Turkey </form></span>');
-                displayDiv.prepend(CF, mThick, mTemp, mType);
                 div.append(switches);
                 switches.change(function () {
                     console.log($('.mytog:checked').attr('id'))
                     graph(false, $('.mytog:checked').attr('id'));
                 });
-                CF.change(function () {
+                $(".switcheroo").change(function () {
                     $('#si1').html("Side 1 (&#176;" + $('.mytog2:checked').attr('id') + ")");
                     $('#si2').html("Side 2 (&#176;" + $('.mytog2:checked').attr('id') + ")");
                     $('#work').html("&#176;" + $('.mytog2:checked').attr('id'));
@@ -357,28 +352,6 @@ var perfectSteak = function (div) {
 
             addDropdown();
         }
-//        var buildDisplay = function () {
-//            if (model.currentInfo["OKToGraph"]) {
-//                div.append("<div class='row'><div class='container optionBar'></div></div><div class='span3'></div><div class='span9'></div></div>");
-//                $(".span3").append(displayDiv);
-//                var switches = $('<div class="switch"><input type="radio" class="mytog" id="PS" name="toggle" checked><label for="PS" class="btn" >Protein State</label><input type="radio" class="mytog"id="T" name="toggle"><label for="T" class="btn" >Temperature</label></div>');
-//                div.append(switches);
-//
-//                switches.change(function () {
-//                    graph(false, $('.mytog:checked').attr('id'));
-//                });
-//
-//                $("#startModal").modal("show");
-//
-//                cookButton = $(".cookButton");
-//                buildTable();
-//            } else {
-//                (".")
-//            }
-//
-//
-//            addDropdown();
-//        }
 
         var buildTable = function () {