Add automatic inclusion of last answer when an operator is entered im…

…mediately after a calculation
imccausl · Jan 20, 2017 · 3f888f7 · 3f888f7
1 parent 2bab083
commit 3f888f7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/js/app/expression.js b/js/app/expression.js
@@ -208,10 +208,16 @@ define( [], function (expression) {
 		 	},
 
 		 	pushToModel = function pushToModel(ch) {
+			 	var operators = ['+', '-', '/', '*', '%', '^', '!'];
 
 				if (_model.content.firstInput === true) {
 					toggleFirstInput();
-					_model.content.data = "";
+
+					if ( (operators.indexOf(ch) > -1) && (_model.lastAns) ) {
+						_model.content.data = _model.lastAns; // if one of the acceptable operators is pressed, push lastAns to model.
+					} else {
+						_model.content.data = ""; // first input after equals, clear model for a clean pushToModel slate.
+					}
 				}
 
 				_model.content.data += ch;

diff --git a/js/app/inputFilter.js b/js/app/inputFilter.js
@@ -153,21 +153,27 @@ define( [], function() {
 
 		 	_getNextFilter = function _getNextFilter(ch, lastCh) {
 				var inputRules = [],
+					defaultFilter = ['numbers', 'pi', 'log', 'root', 'decimal', 'leftParen'],
 					ch = ch || "";
 
 
-				if ( ( ch  ) !== "" ) {					
+				if (ch === "") {
+					// no input rules found, so initialize the input filter with the following allowed inputs:
+					inputRules = defaultFilter;
+				} else if (ch==="postCalc") {
+					defaultFilter.push("multiDiv", "plus", "minus", "pow", "percent");
+					inputRules = defaultFilter;
+				} else {					
 					for( var func in _lexer ) {
 
 						inputRules = _lexer[func](ch, lastCh);
 						if (inputRules) {
-							return _makeFilter(inputRules);
+							break;
 						}	
 					}
-				} else {
-					// no input rules found, so initialize the input filter with the following allowed inputs:
-					return _makeFilter(['numbers', 'pi', 'log', 'root', 'decimal', 'leftParen']);
 				}
+
+				return _makeFilter(inputRules); 
 			},
 
 			_addToFilter = function _addToFilter(item) {

diff --git a/js/app/view.js b/js/app/view.js
@@ -97,6 +97,8 @@ define(['expression', 'MathJax'], function(expression) {
 			},
 
 			swapBufferForScreen = function swapBufferForScreen() {	
+				var historyData = document.getElementById('calc--history');
+
 				mjRunning = mjPending = false;
 
 				// Only swap the buffer if it contains rendered data
@@ -107,7 +109,7 @@ define(['expression', 'MathJax'], function(expression) {
 					elements.history.innerHTML = elements.historyBuffer.innerHTML;
 				}
 
-				elements.history.scrollLeft = elements.history.scrollWidth;
+				historyData.scrollLeft = historyData.scrollWidth;
 				elements.output.scrollLeft = elements.output.scrollWidth;
 
 

diff --git a/js/app/viewModel.js b/js/app/viewModel.js
@@ -34,7 +34,7 @@ define(['view', 'expression', 'inputFilter', 'math'], function(view, expression,
 				}
 
 				finally {
-					inputFilter.setFilter();
+					inputFilter.setFilter("postCalc");
 					view.elements.screen.textContent = model.content.data;
 					view.elements.history.textContent = expr
 						.replace(/\*/g, " ⋅ ")