moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix bug assigning wrong default submit view ID

This commit is contained in:
Bryan Ashby 2015-07-10 11:11:08 -06:00
parent 0d2d2602cd
commit 1f409435f4
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/multi_line_edit_text_view.js
View File

@ -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();

7
core/view.js
View File

@ -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');

8
core/view_controller.js
View File

@ -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;