Cleanup

rcmiller · Jul 31, 2013 · 7fef4b2 · 7fef4b2
1 parent 3f357ba
commit 7fef4b2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 75 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/data.js b/data.js
@@ -1,29 +1,29 @@
 var tempScale={
 			   "Steak":
                 [{'info':'No protein denaturization below 40\xB0 C Raw','position':6},
-                {'info':'Myosin breaks down 40-55\xB0 C Rare','position':5},
-                {'info':'Glycogen breaks down 55-60\xB0 C Medium Rare','position':4},
+                {'info':'Myosin denatures 40-55\xB0 C Rare','position':5},
+                {'info':'Glycogen denatures 55-60\xB0 C Medium Rare','position':4},
                 {'info':'Myoglobin denatures 60-70\xB0 C Medium','position':3},
                 {'info':'Actin denatures 70-120\xB0 C Well','position':2},
-                {'info':'Browning reactions occur 120-180\xB0 C','position':1},
+                {'info':'Browning reactions 120-180\xB0 C','position':1},
 				{'info':'Charring at 180+\xB0 C','position':0}],
 
               "Tuna":
 
                 [{'info':'No protein denaturization below 40\xB0 C','position':6},
-                {'info':'Myosin breaks down 40-50\xB0 C','position':5},
-                {'info':'Myocommata begins to rupture 50\xB0 C','position':4},
+                {'info':'Myosin denatures 40-50\xB0 C','position':5},
+                {'info':'Myocommata rupture 50\xB0 C','position':4},
                 {'info':'Myoglobin denatures 60-70\xB0 C','position':3},
                 {'info':'Actin denatures 70\xB0 C','position':2},
-                {'info':'Fibers begin to disintegrate 90+\xB0 C+','position':1},
+                {'info':'Fibers disintegrate 90+\xB0 C+','position':1},
 				{'info':'Charring at 180+\xB0 C+','position':0}],
 			   "Turkey":
                  [{'info':'No protein denaturization below 40\xB0 C Raw','position':6},
-                {'info':'Myosin breaks down 40-55\xB0 C Rare','position':5},
-                {'info':'Glycogen breaks down 55-60\xB0 C Medium Rare','position':4},
+                {'info':'Myosin denatures 40-55\xB0 C Rare','position':5},
+                {'info':'Glycogen denatures 55-60\xB0 C Medium Rare','position':4},
                 {'info':'Myoglobin denatures 60-70\xB0 C Medium','position':3},
                 {'info':'Actin denatures 70-120\xB0 C Well','position':2},
-                {'info':'Browning reactions occur 120-180\xB0 C','position':1},
+                {'info':'Browning reactions 120-180\xB0 C','position':1},
 				{'info':'Charring at 180+\xB0 C','position':0}]
               };
 

diff --git a/home-screen.css b/home-screen.css
@@ -1,7 +1,11 @@
-.rules:hover, .about:hover{
+.rules:hover, .about:hover, .newSteak:hover{
     color: black !important;
 }
 
+.newSteak{
+    float: right !important;
+}
+
 .modal-body img{
     height: 200px;
     border: 1px solid black;

diff --git a/home-screen.html b/home-screen.html
@@ -31,6 +31,7 @@
             <div class = "nav-collapse collapse">
                 <a class = "brand about" href="#aboutModal" data-toggle = "modal">About</a>
             </div>
+            <a class = "brand newSteak" href="#startModal" data-toggle = "modal">New Meat</a>
         </div>
     </div>
 
@@ -70,26 +71,12 @@ <h3 id="myModalLabel">About this Applet</h3>
 
     <div id="startModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
         <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+<!--        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
         <h3 id="myModalLabel">Create Your Meat</h3>
         </div>
         <div class="modal-body">
             <div id=thickInpDiv>Meat Thickness: <input type='text' id='thicknessInp' value='6'> cm </div>
             <div id=tempInpDiv>Initial Meat Temperature: <input type='text' id='steakTemp' value='23'>&#176;C</div>
-<!--
-            <div id=meatTypeDiv>
-                <div class="dropdown dropup">
-                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                        Select Meat Type <span class="caret"></span>
-                      </button>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
-                    <li><a tabindex="-1" href="#">Steak</a></li>
-                    <li><a tabindex="-1" href="#">Tuna</a></li>
-                    <li><a tabindex="-1" href="#">Turkey</a></li>
-                  </ul>
-                </div>
-                </div>
--->
             <form id="meatInp">What type of meat are you cooking?<br>
                 <input type="radio" name="meat" id="Steak" checked>Steak<br>
                 <input type="radio" name="meat" id="Tuna">Tuna<br>

diff --git a/perfectSteak.js b/perfectSteak.js
@@ -195,53 +195,6 @@ var perfectSteak = function (div) {
                 $("#startModal").modal("show");
 
 				cookButton = $(".cookButton");
-//				
-//				var thicknessInp = ($("<div id=thickInpDiv><input type='text' id='thicknessInp' value='6'></input> Meat Thickness (cm) </div>"));
-//				thicknessInp.change(function(){
-//						model.checkDiv();
-//						if(clicked&&model.currentInfo["OKToGraph"]){graph()}});
-//				var steakTemp = ($("<div id=tempInpDiv><input type='text' id='steakTemp' value='23'></input>Initial Meat Temperature (&#176;C)</div>"));
-//				steakTemp.change(function(){
-//							model.checkDiv();
-//							if(clicked&&model.currentInfo["OKToGraph"]){graph()}});
-//			//Item to hold inputs of meat. Append meatInput to your display
-//				var meatInput=$('<form id="meatInp">What type of meat are you cooking?<br>'
-//					+'<input type="radio" name="meat" id="Steak" checked>Steak<br>'
-//					+'<input type="radio" name="meat" id="Tuna">Tuna<br>'
-//					+'<input type="radio" name="meat" id="Turkey">Turkey</form>');
-//				meatInput.change(function(){
-//							model.checkDiv();
-//							if(clicked&&model.currentInfo["OKToGraph"]){graph()}});
-//				var cookbuttonrow = $("<div class='row'></div");
-//				cookbuttonrow.append(cookButton);
-
-//				$('.optionBar').append(thicknessInp, steakTemp, meatInput,cookbuttonrow);
-
-
-//				cookButton = $("<button class='btn' id='cookButton'>Let's get cooking!</button>");
-//				
-//				var thicknessInp = ($("<div id=thickInpDiv><input type='text' id='thicknessInp' value='6'></input> Meat Thickness (cm) </div>"));
-//				thicknessInp.change(function(){
-//						model.checkDiv();
-//						if(clicked&&model.currentInfo["OKToGraph"]){graph()}});
-//				var steakTemp = ($("<div id=tempInpDiv><input type='text' id='steakTemp' value='23'></input>Initial Meat Temperature (&#176;C)</div>"));
-//				steakTemp.change(function(){
-//							model.checkDiv();
-//							if(clicked&&model.currentInfo["OKToGraph"]){graph()}});
-//			//Item to hold inputs of meat. Append meatInput to your display
-//				var meatInput=$('<form id="meatInp">What type of meat are you cooking?<br>'
-//					+'<input type="radio" name="meat" id="Steak" checked>Steak<br>'
-//					+'<input type="radio" name="meat" id="Tuna">Tuna<br>'
-//					+'<input type="radio" name="meat" id="Turkey">Turkey</form>');
-//				meatInput.change(function(){
-//							model.checkDiv();
-//							if(clicked&&model.currentInfo["OKToGraph"]){graph()}});
-//				
-//						
-//				var cookbuttonrow = $("<div class='row'></div");
-//				cookbuttonrow.append(cookButton);
-//
-//				$('.optionBar').append(thicknessInp, steakTemp, meatInput,cookbuttonrow);
 
 				buildTable();
 				}
@@ -259,7 +212,6 @@ var toF=function(C)
             var timeStep = model.timeStep;
             var len = model.currentInfo["data"].length;
             var newData = []
-//            $("#cookButton").remove();
 			var sumtime=0;
             for (var i = 0; i < model.currentInfo["numRows"]; i++) {
                 var iminus = i - 1;
@@ -293,7 +245,6 @@ var toF=function(C)
                 inputTable.append(row);
                 if (i == model.currentInfo["numRows"] - 1) {
                     inputTable.append(addButton, subButton);
-//                    displayDiv.append(cookButton);
                 }
                 if (len == 0) {
 

diff --git a/sample.js b/sample.js
@@ -6,5 +6,12 @@ var flame=Thedata.points;
 var timestep=1/Thedata.step;
 var maxTemps=Thedata.maxTemps;
 graphSteak(sampledata,flame,timestep,meatType,maxTemps);
-
+
+//	if(localStorage.pastMeats == undefined){//if no meats have been saved before, make this the first one
+//        localStorage.pastMeats = [Thedata];
+//    }
+//    else{ //add this meat to the list of previous meats
+//        localStorage.pastMeats.push(Thedata);
+//    }
+
 }