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

* WIP on new view validation framework

This commit is contained in:
Bryan Ashby 2015-12-10 00:04:38 -07:00
parent 964b899fe5
commit 743035683c
1 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
core/view_controller.js
View File

@ -157,17 +157,28 @@ function ViewController(options) {
case 'method' :
case 'systemMethod' :
if(_.isString(propAsset.location)) {
} else {
if('validate' === propName) {
// :TODO: handle propAsset.location for @method script specification
if('systemMethod' === propAsset.type) {
// :TODO:
// :TODO: implementation validation @systemMethod handling!
} else {
// local to current module
var currentModule = self.client.currentMenuModule;
if(_.isFunction(currentModule.menuMethods[propAsset.asset])) {
// :TODO: Fix formData & extraArgs... this all needs general processing
propValue = currentModule.menuMethods[propAsset.asset]({}, {});//formData, conf.extraArgs);
if(_.isFunction(self.client.currentMenuModule.menuMethods[propAsset.asset])) {
propValue = self.client.currentMenuModule.menuMethods[propAsset.asset];
}
}
} else {
if(_.isString(propAsset.location)) {
} else {
if('systemMethod' === propAsset.type) {
// :TODO:
} else {
// local to current module
var currentModule = self.client.currentMenuModule;
if(_.isFunction(currentModule.menuMethods[propAsset.asset])) {
// :TODO: Fix formData & extraArgs... this all needs general processing
propValue = currentModule.menuMethods[propAsset.asset]({}, {});//formData, conf.extraArgs);
}
}
}
}
@ -362,7 +373,40 @@ ViewController.prototype.setFocus = function(focused) {
};
ViewController.prototype.switchFocus = function(id) {
//this.setFocus(true); // ensure events are attached
//
// Perform focus switching validation now
//
var self = this;
var focusedView = self.focusedView;
function performSwitch() {
self.attachClientEvents();
// remove from old
self.setViewFocusWithEvents(focusedView, false);
// set to new
self.setViewFocusWithEvents(self.getView(id), true);
};
if(focusedView && focusedView.validate) {
focusedView.validate(focusedView.getData(), function validated(isValid, msgProp) {
if(isValid) {
performSwitch();
} else {
if(_.isFunction(self.client.currentMenuModule.menuMethods.validationFailure)) {
self.client.currentMenuModule.menuMethods.validationFailure(focusedView, msgProp, function validateFailNext() {
});
}
}
});
} else {
performSwitch();
}
/*
this.attachClientEvents();
// remove from old
@ -370,15 +414,19 @@ ViewController.prototype.switchFocus = function(id) {
// set to new
this.setViewFocusWithEvents(this.getView(id), true);
*/
};
ViewController.prototype.nextFocus = function() {
ViewController.prototype.nextFocus = function() {
var nextId;
if(!this.focusedView) {
this.switchFocus(this.views[this.firstId].id);
nextId = this.views[this.firstId].id;
} else {
var nextId = this.views[this.focusedView.id].nextId;
this.switchFocus(nextId);
nextId = this.views[this.focusedView.id].nextId;
}
this.switchFocus(nextId);
};
ViewController.prototype.setViewOrder = function(order) {