Merge pull request #50 from philbuchanan/#49

#49 Fixed issue with appending history items to equations
philbuchanan · Dec 17, 2015 · 55caf92 · 55caf92
2 parents d17c656 + 22ba4b4
commit 55caf92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/calculator.appcache b/calculator.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# v3.2: 2015-12-17
+# v3.2.1: 2015-12-17
 index.html
 js/script.js
 css/style.css

diff --git a/js/script.js b/js/script.js
@@ -4,7 +4,7 @@
  * A calculator iOS web application that supports brackets, backspace and saved
  * calculation history. The app uses HTML5 app caching so it will work offline.
  *
- * @version 3.2
+ * @version 3.2.1
  */
 
 "use strict";
@@ -64,7 +64,7 @@ if (!Array.prototype.appendToLast) {
  */
 function Calculator() {
 	this.settings = {
-		version: '3.2',
+		version: '3.2.1',
 		history: 50,
 		fontsize: 60,
 		decimals: 2
@@ -843,15 +843,15 @@ Calculator.prototype.appendHistoryItemToEquation = function(value) {
 	switch(this.appstate.last) {
 		case null:
 			this.appstate.input = [value];
-			this.appstate.last = 1;
+			this.appstate.last = '1';
 			break;
 		case '*':
 		case '/':
 		case '+':
 		case '-':
 		case '(':
 			this.appstate.input.push(value);
-			this.appstate.last = 1;
+			this.appstate.last = '1';
 			break;
 	}