From 63a5d48b98ae964df1b7e3f522c7490a96fa01ea Mon Sep 17 00:00:00 2001
From: devin hanaway <devinh11@gmail.com>
Date: Mon, 27 Feb 2017 19:10:41 -0700
Subject: [PATCH 1/4] calcualtor works

---
 js/index.js | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/js/index.js b/js/index.js
index e69de29..eed9b00 100644
--- a/js/index.js
+++ b/js/index.js
@@ -0,0 +1,38 @@
+$(document).ready(function(){
+
+  // var num1 = ''
+  // var num2 = ''
+  // var op = ''
+
+  // Number(num1) + op +
+
+  var currentString = ""
+  var answer = 8
+  $("span").not('#equals').click(function(){
+    currentString += $(this).text();
+    $("#screen").text(currentString)
+  })
+
+
+  $("#clear").click(function(){
+    currentString = '';
+    $("#screen").text(currentString)
+  })
+
+  $('#equals').click(function(){
+    var replaceX = currentString.replace('x','*')
+    var total = replaceX.replace('\xF7','/')
+    var answer = eval(total)
+    $('#screen').text(answer)
+    if ($('#screen').text()==="Infinity"){
+      $('#screen').text('error')
+    }
+  })
+
+
+
+})
+
+// function updateScreen(a,b,c){
+//   $('#screen').html(a+b+c)
+// }

From 12af7d304625458e92a03247ffb5058da790738d Mon Sep 17 00:00:00 2001
From: devin hanaway <devinh11@gmail.com>
Date: Tue, 28 Feb 2017 08:50:25 -0700
Subject: [PATCH 2/4] update

---
 index.html  |  1 +
 js/index.js | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 9c8ba93..4c36727 100644
--- a/index.html
+++ b/index.html
@@ -38,5 +38,6 @@
         </div>
       </div>
     </div>
+    <script src="js/jquery.js"></script>
   </body>
 </html>
diff --git a/js/index.js b/js/index.js
index eed9b00..053f5e3 100644
--- a/js/index.js
+++ b/js/index.js
@@ -23,10 +23,19 @@ $(document).ready(function(){
     var replaceX = currentString.replace('x','*')
     var total = replaceX.replace('\xF7','/')
     var answer = eval(total)
-    $('#screen').text(answer)
-    if ($('#screen').text()==="Infinity"){
-      $('#screen').text('error')
-    }
+    currentString = answer
+      $('#screen').text(answer)
+      if ($('#screen').text()==="Infinity" ){
+        $('#screen').text('error')
+      }
+      // var lastHas = false
+      // if (answer.)
+    // for (var i = 0; i < answer.length; i++){
+    //   if (answer.charAt(i)=answer.charAt(i+1)){
+    //     answer = "error"
+    //   }
+    // }
+
   })
 
 

From da0c82981c1698253136ce0a2350b1ba2fd05422 Mon Sep 17 00:00:00 2001
From: devin hanaway <devinh11@gmail.com>
Date: Tue, 28 Feb 2017 10:24:36 -0700
Subject: [PATCH 3/4] savingUpdate

---
 js/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/index.js b/js/index.js
index 053f5e3..5c86b84 100644
--- a/js/index.js
+++ b/js/index.js
@@ -27,14 +27,14 @@ $(document).ready(function(){
       $('#screen').text(answer)
       if ($('#screen').text()==="Infinity" ){
         $('#screen').text('error')
+      // for (var i = 0; i < currentString.length; i++){
+      //   if (currentString.charAt(i)===currentString.charAt(i-1)){
+      //     $('#screen').text('error')
+      //   }
+      // }
       }
-      // var lastHas = false
-      // if (answer.)
-    // for (var i = 0; i < answer.length; i++){
-    //   if (answer.charAt(i)=answer.charAt(i+1)){
-    //     answer = "error"
-    //   }
-    // }
+
+
 
   })
 

From 1467c0ddcff9b1a0271c4f99639900ed015bb311 Mon Sep 17 00:00:00 2001
From: devin hanaway <devinh11@gmail.com>
Date: Tue, 28 Feb 2017 18:41:49 -0700
Subject: [PATCH 4/4] added incorrect format error

---
 js/index.js | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/js/index.js b/js/index.js
index 5c86b84..e439665 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1,32 +1,54 @@
 $(document).ready(function(){
 
-  // var num1 = ''
-  // var num2 = ''
-  // var op = ''
-
-  // Number(num1) + op +
-
   var currentString = ""
   var answer = 8
+  var lastClick = false
+
   $("span").not('#equals').click(function(){
-    currentString += $(this).text();
-    $("#screen").text(currentString)
+    if (currentString === 'error'){
+      $('#screen').text(currentString)
+    }
+      else
+        if (lastClick === true && $(this).hasClass('operator')){
+          currentString = 'error'
+          $('#screen').text(currentString)
+        }
+      else {
+        currentString += $(this).text();
+        $("#screen").text(currentString)
+        if ($(this).hasClass('operator')){
+          lastClick = true
+        }
+          else {
+            lastClick = false
+          }
+      }
+
   })
 
 
   $("#clear").click(function(){
-    currentString = '';
+    currentString = ''
     $("#screen").text(currentString)
   })
 
   $('#equals').click(function(){
+    if (currentString === 'error'){
+      $('#screen').text(currentString)
+    }
+    else
+      if (lastClick === true){
+        currentString = 'error'
+        $('#screen').text(currentString)
+    }
     var replaceX = currentString.replace('x','*')
     var total = replaceX.replace('\xF7','/')
     var answer = eval(total)
     currentString = answer
       $('#screen').text(answer)
       if ($('#screen').text()==="Infinity" ){
-        $('#screen').text('error')
+        currentString = 'error'
+        $('#screen').text(currentString)
       // for (var i = 0; i < currentString.length; i++){
       //   if (currentString.charAt(i)===currentString.charAt(i-1)){
       //     $('#screen').text('error')
@@ -36,6 +58,8 @@ $(document).ready(function(){
 
 
 
+
+
   })