From 1f409435f46c109c1becfbcf537968c8902fe4b2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 10 Jul 2015 11:11:08 -0600
Subject: [PATCH] * Fix bug assigning wrong default submit view ID

---
 core/multi_line_edit_text_view.js | 2 +-
 core/view.js                      | 7 ++++---
 core/view_controller.js           | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index d10c60c2..92411a90 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -1052,7 +1052,7 @@ MultiLineEditTextView.prototype.setText = function(text) {
 	//this.textLines = [ { text : '' } ];
 	//this.insertRawText('');
 	//text = "Tab:\r\n\tA\tB\tC\tD\tE\tF\tG\r\n reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally long word!!!";
-	text = require('fs').readFileSync('/home/nuskooler/Downloads/test_text.txt', { encoding : 'utf-8'});
+	text = require('fs').readFileSync('/home/bashby/Downloads/test_text.txt', { encoding : 'utf-8'});
 
 	this.insertRawText(text);//, 0, 0);
 	this.cursorEndOfDocument();
diff --git a/core/view.js b/core/view.js
index 25b4f064..1cfa46dd 100644
--- a/core/view.js
+++ b/core/view.js
@@ -207,9 +207,10 @@ View.prototype.setPropertyValue = function(propName, value) {
 		case 'submit' :
 			if(_.isBoolean(value)) {
 				this.submit = value;
-			} else {
+			}/* else {
 				this.submit = _.isArray(value) && value.length > 0;
 			}
+			*/
 			break;
 
 		case 'submitArgName' : this.submitArgName = value; break;
@@ -236,8 +237,8 @@ View.prototype.setFocus = function(focused) {
 };
 
 View.prototype.onKeyPress = function(ch, key) {
-	assert(this.hasFocus, 'View does not have focus');
-	assert(this.acceptsInput, 'View does not accept input');
+	assert(this.hasFocus,		'View does not have focus');
+	assert(this.acceptsInput,	'View does not accept input');
 
 	if(key) {
 		assert(this.specialKeyMap, 'No special key map defined');
diff --git a/core/view_controller.js b/core/view_controller.js
index ec8793a4..054d051f 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -84,7 +84,6 @@ function ViewController(options) {
 				break;
 
 			case 'accept' :	//	:TODO: consider naming this 'done'
-				//	:TODO: check if id is submit, etc.
 				if(self.focusedView && self.focusedView.submit) {
 					self.submitForm();
 				} else {
@@ -177,6 +176,10 @@ function ViewController(options) {
 			var viewId		= parseInt(mciMatch[2]);
 			assert(!isNaN(viewId));
 
+			if(viewId > highestId) {
+				highestId = viewId;
+			}
+
 			var view		= self.getView(viewId);
 			
 			if(!view) {
@@ -207,8 +210,7 @@ function ViewController(options) {
 
 			nextItem(null);
 		},
-		function complete(err) {
-			
+		function complete(err) {		
 			//	default to highest ID if no 'submit' entry present
 			if(!submitId) {
 				self.getView(highestId).submit = true;