* Use standard MCI codes in FSE/etc.
* Add mod mixin for temp area/conf switch e.g. used by new scan, fse, so on * string utils: renderSubstr(), renderStringLength(): Works with *rendered* text. That is, is smart enough to ignore ANSI and RA style pipe color codes * string util pad() works with ANSI/RA pipe codes * TextView can now display text with RA pipe codes and MCI codes * Message conf/area welcome art #81 * Update luciano art with new MCI
This commit is contained in:
@@ -2,9 +2,12 @@
|
||||
'use strict';
|
||||
|
||||
// ENiGMA½
|
||||
const MenuModule = require('../core/menu_module.js').MenuModule;
|
||||
const ViewController = require('../core/view_controller.js').ViewController;
|
||||
const messageArea = require('../core/message_area.js');
|
||||
const MenuModule = require('../core/menu_module.js').MenuModule;
|
||||
const ViewController = require('../core/view_controller.js').ViewController;
|
||||
const messageArea = require('../core/message_area.js');
|
||||
const displayThemeArt = require('../core/theme.js').displayThemeArt;
|
||||
const displayThemedPause = require('../core/theme.js').displayThemedPause;
|
||||
const resetScreen = require('../core/ansi_term.js').resetScreen;
|
||||
|
||||
// deps
|
||||
const async = require('async');
|
||||
@@ -33,7 +36,9 @@ exports.moduleInfo = {
|
||||
*/
|
||||
|
||||
const MCICodesIDs = {
|
||||
AreaList : 1,
|
||||
AreaList : 1,
|
||||
SelAreaInfo1 : 2,
|
||||
SelAreaInfo2 : 3,
|
||||
};
|
||||
|
||||
function MessageAreaListModule(options) {
|
||||
@@ -46,20 +51,46 @@ function MessageAreaListModule(options) {
|
||||
{ client : self.client }
|
||||
);
|
||||
|
||||
this.prevMenuOnTimeout = function(timeout, cb) {
|
||||
setTimeout( () => {
|
||||
self.prevMenu(cb);
|
||||
}, timeout);
|
||||
};
|
||||
|
||||
this.menuMethods = {
|
||||
changeArea : function(formData, extraArgs, cb) {
|
||||
if(1 === formData.submitId) {
|
||||
const areaTag = self.messageAreas[formData.value.area].areaTag;
|
||||
let area = self.messageAreas[formData.value.area];
|
||||
const areaTag = area.areaTag;
|
||||
area = area.area; // what we want is actually embedded
|
||||
|
||||
messageArea.changeMessageArea(self.client, areaTag, err => {
|
||||
if(err) {
|
||||
self.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
|
||||
|
||||
setTimeout( () => {
|
||||
self.prevMenuOnTimeout(1000, cb);
|
||||
} else {
|
||||
if(_.isString(area.art)) {
|
||||
const dispOptions = {
|
||||
client : self.client,
|
||||
name : area.art,
|
||||
};
|
||||
|
||||
self.client.term.rawWrite(resetScreen());
|
||||
|
||||
displayThemeArt(dispOptions, () => {
|
||||
// pause by default, unless explicitly told not to
|
||||
if(_.has(area, 'options.pause') && false === area.options.pause) {
|
||||
return self.prevMenuOnTimeout(1000, cb);
|
||||
} else {
|
||||
displayThemedPause( { client : self.client }, () => {
|
||||
return self.prevMenu(cb);
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return self.prevMenu(cb);
|
||||
}, 1000);
|
||||
} else {
|
||||
return self.prevMenu(cb);
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -75,6 +106,19 @@ function MessageAreaListModule(options) {
|
||||
}
|
||||
};
|
||||
|
||||
this.updateGeneralAreaInfoViews = function(areaIndex) {
|
||||
/* experimental: not yet avail
|
||||
const areaInfo = self.messageAreas[areaIndex];
|
||||
|
||||
[ MCICodesIDs.SelAreaInfo1, MCICodesIDs.SelAreaInfo2 ].forEach(mciId => {
|
||||
const v = self.viewControllers.areaList.getView(mciId);
|
||||
if(v) {
|
||||
v.setFormatObject(areaInfo.area);
|
||||
}
|
||||
});
|
||||
*/
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
require('util').inherits(MessageAreaListModule, MenuModule);
|
||||
@@ -126,6 +170,10 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
|
||||
});
|
||||
}));
|
||||
|
||||
areaListView.on('index update', areaIndex => {
|
||||
self.updateGeneralAreaInfoViews(areaIndex);
|
||||
});
|
||||
|
||||
areaListView.redraw();
|
||||
|
||||
callback(null);
|
||||
|
||||
@@ -2,9 +2,12 @@
|
||||
'use strict';
|
||||
|
||||
// ENiGMA½
|
||||
const MenuModule = require('../core/menu_module.js').MenuModule;
|
||||
const ViewController = require('../core/view_controller.js').ViewController;
|
||||
const messageArea = require('../core/message_area.js');
|
||||
const MenuModule = require('../core/menu_module.js').MenuModule;
|
||||
const ViewController = require('../core/view_controller.js').ViewController;
|
||||
const messageArea = require('../core/message_area.js');
|
||||
const displayThemeArt = require('../core/theme.js').displayThemeArt;
|
||||
const displayThemedPause = require('../core/theme.js').displayThemedPause;
|
||||
const resetScreen = require('../core/ansi_term.js').resetScreen;
|
||||
|
||||
// deps
|
||||
const async = require('async');
|
||||
@@ -33,10 +36,18 @@ function MessageConfListModule(options) {
|
||||
|
||||
this.messageConfs = messageArea.getSortedAvailMessageConferences(self.client);
|
||||
|
||||
this.prevMenuOnTimeout = function(timeout, cb) {
|
||||
setTimeout( () => {
|
||||
self.prevMenu(cb);
|
||||
}, timeout);
|
||||
};
|
||||
|
||||
this.menuMethods = {
|
||||
changeConference : function(formData, extraArgs, cb) {
|
||||
if(1 === formData.submitId) {
|
||||
const confTag = self.messageConfs[formData.value.conf].confTag;
|
||||
let conf = self.messageConfs[formData.value.conf];
|
||||
const confTag = conf.confTag;
|
||||
conf = conf.conf; // what we want is embedded
|
||||
|
||||
messageArea.changeMessageConference(self.client, confTag, err => {
|
||||
if(err) {
|
||||
@@ -46,7 +57,27 @@ function MessageConfListModule(options) {
|
||||
return self.prevMenu(cb);
|
||||
}, 1000);
|
||||
} else {
|
||||
return self.prevMenu(cb);
|
||||
if(_.isString(conf.art)) {
|
||||
const dispOptions = {
|
||||
client : self.client,
|
||||
name : conf.art,
|
||||
};
|
||||
|
||||
self.client.term.rawWrite(resetScreen());
|
||||
|
||||
displayThemeArt(dispOptions, () => {
|
||||
// pause by default, unless explicitly told not to
|
||||
if(_.has(conf, 'options.pause') && false === conf.options.pause) {
|
||||
return self.prevMenuOnTimeout(1000, cb);
|
||||
} else {
|
||||
displayThemedPause( { client : self.client }, () => {
|
||||
return self.prevMenu(cb);
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return self.prevMenu(cb);
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
|
||||
@@ -116,6 +116,8 @@ function MessageListModule(options) {
|
||||
|
||||
require('util').inherits(MessageListModule, MenuModule);
|
||||
|
||||
require('../core/mod_mixins.js').MessageAreaConfTempSwitcher.call(MessageListModule.prototype);
|
||||
|
||||
MessageListModule.prototype.enter = function() {
|
||||
MessageListModule.super_.prototype.enter.call(this);
|
||||
|
||||
@@ -124,23 +126,14 @@ MessageListModule.prototype.enter = function() {
|
||||
// the user's current area
|
||||
//
|
||||
if(this.messageAreaTag) {
|
||||
this.prevMessageConfAndArea = {
|
||||
confTag : this.client.user.properties.message_conf_tag,
|
||||
areaTag : this.client.user.properties.message_area_tag,
|
||||
};
|
||||
if(!messageArea.tempChangeMessageConfAndArea(this.client, this.messageAreaTag)) {
|
||||
// :TODO: Really, checks should have been done & failed before this, but log here!
|
||||
}
|
||||
this.tempMessageConfAndAreaSwitch(this.messageAreaTag);
|
||||
} else {
|
||||
this.messageAreaTag = this.messageAreaTag = this.client.user.properties.message_area_tag;
|
||||
}
|
||||
};
|
||||
|
||||
MessageListModule.prototype.leave = function() {
|
||||
if(this.prevMessageConfAndArea) {
|
||||
this.client.user.properties.message_conf_tag = this.prevMessageConfAndArea.confTag;
|
||||
this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;
|
||||
}
|
||||
this.tempMessageConfAndAreaRestore();
|
||||
|
||||
MessageListModule.super_.prototype.leave.call(this);
|
||||
};
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user