Rely on pty.js, minor updates to area changing logic

This commit is contained in:
Bryan Ashby 2015-08-18 23:11:13 -06:00
parent c9a24b7ec8
commit d3f82e38da
5 changed files with 25 additions and 16 deletions

View file

@ -37,7 +37,15 @@ function MessageAreaListModule(options) {
if(1 === formData.submitId) {
var areaId = self.messageAreas[formData.value.area].areaId;
messageArea.changeCurrentArea(self.client, areaId, function areaChanged(err) {
self.client.gotoMenuModule( { name : self.menuConfig.fallback } );
if(err) {
self.client.term.write('\nCannot change area: ' + err.message + '\n');
setTimeout(function timeout() {
self.client.gotoMenuModule( { name : self.menuConfig.fallback } );
}, 1000);
} else {
self.client.gotoMenuModule( { name : self.menuConfig.fallback } );
}
});
}
}
@ -61,8 +69,6 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
var self = this;
var vc = self.viewControllers.areaList = new ViewController( { client : self.client } );
//var messageAreas = [];
async.series(
[
function callParentMciReady(callback) {
@ -81,14 +87,6 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
callback(err);
});
},
/*
function fetchAreaData(callback) {
messageArea.getAvailableMessageAreas(function fetched(err, areas) {
messageAreas = areas;
callback(err);
});
},
*/
function populateAreaListView(callback) {
var areaListView = vc.getView(1);
@ -99,8 +97,6 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
areaList.push(strUtil.format(self.entryFormat, msgArea));
});
console.log(areaList)
areaListView.setItems(areaList);
areaListView.redraw();
}