* 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:
Bryan Ashby
parent
3d098e927a
commit
969cd35ece
|
|
@ -7,10 +7,10 @@ var getPredefinedMCIValue = require('./predefined_mci.js').getPredefinedMCIValue
|
|||
var assert = require('assert');
|
||||
var _ = require('lodash');
|
||||
|
||||
exports.enigmaToAnsi = enigmaToAnsi;
|
||||
exports.stripPipeCodes = exports.stripEnigmaCodes = stripEnigmaCodes;
|
||||
exports.pipeStrLen = exports.enigmaStrLen = enigmaStrLen;
|
||||
exports.pipeToAnsi = exports.renegadeToAnsi = renegadeToAnsi;
|
||||
exports.enigmaToAnsi = enigmaToAnsi;
|
||||
exports.stripPipeCodes = exports.stripEnigmaCodes = stripEnigmaCodes;
|
||||
exports.pipeStrLen = exports.enigmaStrLen = enigmaStrLen;
|
||||
exports.pipeToAnsi = exports.renegadeToAnsi = renegadeToAnsi;
|
||||
|
||||
// :TODO: Not really happy with the module name of "color_codes". Would like something better
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ function renegadeToAnsi(s, client) {
|
|||
var result = '';
|
||||
var re = /\|([A-Z\d]{2}|\|)/g;
|
||||
var m;
|
||||
var lastIndex = 0;
|
||||
var lastIndex = 0;
|
||||
while((m = re.exec(s))) {
|
||||
var val = m[1];
|
||||
|
||||
|
|
@ -141,10 +141,8 @@ function renegadeToAnsi(s, client) {
|
|||
result += s.substr(lastIndex, m.index - lastIndex) + attr;
|
||||
}
|
||||
|
||||
lastIndex = re.lastIndex;
|
||||
lastIndex = re.lastIndex;
|
||||
}
|
||||
|
||||
result = (0 === result.length ? s : result + s.substr(lastIndex));
|
||||
|
||||
return result;
|
||||
return (0 === result.length ? s : result + s.substr(lastIndex));
|
||||
}
|
||||
|
|
|
|||
85
core/fse.js
85
core/fse.js
|
|
@ -71,7 +71,7 @@ var MCICodeIds = {
|
|||
From : 1,
|
||||
To : 2,
|
||||
Subject : 3,
|
||||
AreaName : 4,
|
||||
|
||||
DateTime : 5,
|
||||
MsgNum : 6,
|
||||
MsgTotal : 7,
|
||||
|
|
@ -196,10 +196,9 @@ function FullScreenEditorModule(options) {
|
|||
|
||||
if(self.isViewMode()) {
|
||||
return {
|
||||
from : vc.getView(1),
|
||||
to : vc.getView(2),
|
||||
subject : vc.getView(3),
|
||||
areaName : vc.getView(4),
|
||||
from : vc.getView(1),
|
||||
to : vc.getView(2),
|
||||
subject : vc.getView(3),
|
||||
|
||||
dateTime : vc.getView(5),
|
||||
msgNum : vc.getView(7),
|
||||
|
|
@ -551,28 +550,26 @@ function FullScreenEditorModule(options) {
|
|||
function setInitialData(callback) {
|
||||
|
||||
switch(self.editorMode) {
|
||||
case 'view' :
|
||||
if(self.message) {
|
||||
self.initHeaderViewMode();
|
||||
self.initFooterViewMode();
|
||||
case 'view' :
|
||||
if(self.message) {
|
||||
self.initHeaderViewMode();
|
||||
self.initFooterViewMode();
|
||||
|
||||
var bodyMessageView = self.viewControllers.body.getView(1);
|
||||
if(bodyMessageView && _.has(self, 'message.message')) {
|
||||
//self.setBodyMessageViewText();
|
||||
bodyMessageView.setText(cleanControlCodes(self.message.message));
|
||||
}
|
||||
var bodyMessageView = self.viewControllers.body.getView(1);
|
||||
if(bodyMessageView && _.has(self, 'message.message')) {
|
||||
//self.setBodyMessageViewText();
|
||||
bodyMessageView.setText(cleanControlCodes(self.message.message));
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'edit' :
|
||||
self.viewControllers.header.getView(1).setText(self.client.user.username); // from
|
||||
case 'edit' :
|
||||
self.viewControllers.header.getView(1).setText(self.client.user.username); // from
|
||||
|
||||
if(self.replyToMessage) {
|
||||
self.initHeaderReplyEditMode();
|
||||
} else {
|
||||
self.initHeaderNewEditMode();
|
||||
}
|
||||
break;
|
||||
if(self.replyToMessage) {
|
||||
self.initHeaderReplyEditMode();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
callback(null);
|
||||
|
|
@ -580,14 +577,14 @@ function FullScreenEditorModule(options) {
|
|||
function setInitialFocus(callback) {
|
||||
|
||||
switch(self.editorMode) {
|
||||
case 'edit' :
|
||||
self.switchToHeader();
|
||||
break;
|
||||
case 'edit' :
|
||||
self.switchToHeader();
|
||||
break;
|
||||
|
||||
case 'view' :
|
||||
self.switchToFooter();
|
||||
//self.observeViewPosition();
|
||||
break;
|
||||
case 'view' :
|
||||
self.switchToFooter();
|
||||
//self.observeViewPosition();
|
||||
break;
|
||||
}
|
||||
|
||||
callback(null);
|
||||
|
|
@ -655,20 +652,14 @@ function FullScreenEditorModule(options) {
|
|||
}
|
||||
};
|
||||
|
||||
this.initHeaderGeneric = function() {
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.AreaName, getMessageAreaByTag(self.messageAreaTag).name);
|
||||
};
|
||||
|
||||
this.initHeaderViewMode = function() {
|
||||
assert(_.isObject(self.message));
|
||||
|
||||
self.initHeaderGeneric();
|
||||
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.From, self.message.fromUserName);
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.To, self.message.toUserName);
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.To, self.message.toUserName);
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.Subject, self.message.subject);
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.DateTime, moment(self.message.modTimestamp).format(self.client.currentTheme.helpers.getDateTimeFormat()));
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.MsgNum, (self.messageIndex + 1).toString());
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.MsgNum, (self.messageIndex + 1).toString());
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.MsgTotal, self.messageTotal.toString());
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.ViewCount, self.message.viewCount);
|
||||
self.setHeaderText(MCICodeIds.ViewModeHeader.HashTags, 'TODO hash tags');
|
||||
|
|
@ -676,15 +667,9 @@ function FullScreenEditorModule(options) {
|
|||
self.setHeaderText(MCICodeIds.ViewModeHeader.ReplyToMsgID, self.message.replyToMessageId);
|
||||
};
|
||||
|
||||
this.initHeaderNewEditMode = function() {
|
||||
self.initHeaderGeneric();
|
||||
};
|
||||
|
||||
this.initHeaderReplyEditMode = function() {
|
||||
assert(_.isObject(self.replyToMessage));
|
||||
|
||||
self.initHeaderGeneric();
|
||||
|
||||
self.setHeaderText(MCICodeIds.ReplyEditModeHeader.To, self.replyToMessage.fromUserName);
|
||||
|
||||
//
|
||||
|
|
@ -991,10 +976,22 @@ function FullScreenEditorModule(options) {
|
|||
|
||||
require('util').inherits(FullScreenEditorModule, MenuModule);
|
||||
|
||||
require('./mod_mixins.js').MessageAreaConfTempSwitcher.call(FullScreenEditorModule.prototype);
|
||||
|
||||
FullScreenEditorModule.prototype.enter = function() {
|
||||
|
||||
if(this.messageAreaTag) {
|
||||
this.tempMessageConfAndAreaSwitch(this.messageAreaTag);
|
||||
}
|
||||
|
||||
FullScreenEditorModule.super_.prototype.enter.call(this);
|
||||
};
|
||||
|
||||
FullScreenEditorModule.prototype.leave = function() {
|
||||
this.tempMessageConfAndAreaRestore();
|
||||
FullScreenEditorModule.super_.prototype.leave.call(this);
|
||||
};
|
||||
|
||||
FullScreenEditorModule.prototype.mciReady = function(mciData, cb) {
|
||||
this.mciReadyHandler(mciData, cb);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
/* jslint node: true */
|
||||
'use strict';
|
||||
|
||||
var assert = require('assert');
|
||||
const messageArea = require('../core/message_area.js');
|
||||
|
||||
// deps
|
||||
const assert = require('assert');
|
||||
|
||||
//
|
||||
// A simple mixin for View Controller management
|
||||
//
|
||||
var ViewControllerManagement = function() {
|
||||
exports.ViewControllerManagement = function() {
|
||||
this.initViewControllers = function() {
|
||||
this.viewControllers = {};
|
||||
};
|
||||
|
|
@ -27,4 +30,27 @@ var ViewControllerManagement = function() {
|
|||
};
|
||||
};
|
||||
|
||||
exports.ViewControllerManagement = ViewControllerManagement;
|
||||
exports.MessageAreaConfTempSwitcher = function() {
|
||||
|
||||
this.tempMessageConfAndAreaSwitch = function(messageAreaTag) {
|
||||
messageAreaTag = messageAreaTag || this.messageAreaTag;
|
||||
if(!messageAreaTag) {
|
||||
return; // nothing to do!
|
||||
}
|
||||
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)) {
|
||||
this.client.log.warn( { messageAreaTag : messageArea }, 'Failed to perform temporary message area/conf switch');
|
||||
}
|
||||
};
|
||||
|
||||
this.tempMessageConfAndAreaRestore = function() {
|
||||
if(this.prevMessageConfAndArea) {
|
||||
this.client.user.properties.message_conf_tag = this.prevMessageConfAndArea.confTag;
|
||||
this.client.user.properties.message_area_tag = this.prevMessageConfAndArea.areaTag;
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,28 +7,6 @@ const sysDb = require('./database.js').dbs.system;
|
|||
const _ = require('lodash');
|
||||
const moment = require('moment');
|
||||
|
||||
/*
|
||||
System Log & Stats
|
||||
|
||||
Purpose
|
||||
* Timestamped log entries of events
|
||||
=> name=user_login, val=username, user_id=X (allows history of per-user or system wide)
|
||||
=> name=
|
||||
=> Replaces stats.js (last callers)
|
||||
=> timestamp, user_id, log_name, log_value
|
||||
|
||||
* Some entries should be "system" (user_id=0) while others are per-user
|
||||
* Aggregate/totals entries such as total login, & other system-wide totals
|
||||
=> login_count, post_count, ...
|
||||
=> Live table is a) init @ load time, b) kept up to date with same name=value pairs
|
||||
=> Replaces system_property.js (mostly the same functionality)
|
||||
=> User properties are kept for user-specfic
|
||||
*
|
||||
*/
|
||||
|
||||
// :TODO: Load & use config for how many day(s) to keep event log entries per type: system/user & logName combinations (cont.)
|
||||
// ...defaults for login_history, and so on
|
||||
|
||||
/*
|
||||
System Event Log & Stats
|
||||
------------------------
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* jslint node: true */
|
||||
'use strict';
|
||||
|
||||
let miscUtil = require('./misc_util.js');
|
||||
|
||||
let iconv = require('iconv-lite');
|
||||
// ENiGMA½
|
||||
const miscUtil = require('./misc_util.js');
|
||||
const iconv = require('iconv-lite');
|
||||
|
||||
exports.stylizeString = stylizeString;
|
||||
exports.pad = pad;
|
||||
|
|
@ -11,16 +11,15 @@ exports.replaceAt = replaceAt;
|
|||
exports.isPrintable = isPrintable;
|
||||
exports.debugEscapedString = debugEscapedString;
|
||||
exports.stringFromNullTermBuffer = stringFromNullTermBuffer;
|
||||
exports.renderSubstr = renderSubstr;
|
||||
exports.renderStringLength = renderStringLength;
|
||||
exports.cleanControlCodes = cleanControlCodes;
|
||||
|
||||
// :TODO: create Unicode verison of this
|
||||
var VOWELS = [ 'a', 'e', 'i', 'o', 'u' ];
|
||||
const VOWELS = [ 'a', 'e', 'i', 'o', 'u' ];
|
||||
VOWELS.concat(VOWELS.map(l => l.toUpperCase()));
|
||||
|
||||
VOWELS.forEach(function onVowel(v) {
|
||||
VOWELS.push(v.toUpperCase());
|
||||
});
|
||||
|
||||
var SIMPLE_ELITE_MAP = {
|
||||
const SIMPLE_ELITE_MAP = {
|
||||
'a' : '4',
|
||||
'e' : '3',
|
||||
'i' : '1',
|
||||
|
|
@ -36,82 +35,86 @@ function stylizeString(s, style) {
|
|||
var stylized = '';
|
||||
|
||||
switch(style) {
|
||||
// None/normal
|
||||
case 'normal' :
|
||||
case 'N' : return s;
|
||||
// None/normal
|
||||
case 'normal' :
|
||||
case 'N' :
|
||||
return s;
|
||||
|
||||
// UPPERCASE
|
||||
case 'upper' :
|
||||
case 'U' : return s.toUpperCase();
|
||||
// UPPERCASE
|
||||
case 'upper' :
|
||||
case 'U' :
|
||||
return s.toUpperCase();
|
||||
|
||||
// lowercase
|
||||
case 'lower' :
|
||||
case 'l' : return s.toLowerCase();
|
||||
// lowercase
|
||||
case 'lower' :
|
||||
case 'l' :
|
||||
return s.toLowerCase();
|
||||
|
||||
// Title Case
|
||||
case 'title' :
|
||||
case 'T' :
|
||||
return s.replace(/\w\S*/g, function onProperCaseChar(t) {
|
||||
return t.charAt(0).toUpperCase() + t.substr(1).toLowerCase();
|
||||
});
|
||||
// Title Case
|
||||
case 'title' :
|
||||
case 'T' :
|
||||
return s.replace(/\w\S*/g, function onProperCaseChar(t) {
|
||||
return t.charAt(0).toUpperCase() + t.substr(1).toLowerCase();
|
||||
});
|
||||
|
||||
// fIRST lOWER
|
||||
case 'first lower' :
|
||||
case 'f' :
|
||||
return s.replace(/\w\S*/g, function onFirstLowerChar(t) {
|
||||
return t.charAt(0).toLowerCase() + t.substr(1).toUpperCase();
|
||||
});
|
||||
// fIRST lOWER
|
||||
case 'first lower' :
|
||||
case 'f' :
|
||||
return s.replace(/\w\S*/g, function onFirstLowerChar(t) {
|
||||
return t.charAt(0).toLowerCase() + t.substr(1).toUpperCase();
|
||||
});
|
||||
|
||||
// SMaLL VoWeLS
|
||||
case 'small vowels' :
|
||||
case 'v' :
|
||||
for(i = 0; i < len; ++i) {
|
||||
c = s[i];
|
||||
if(-1 !== VOWELS.indexOf(c)) {
|
||||
stylized += c.toLowerCase();
|
||||
} else {
|
||||
stylized += c.toUpperCase();
|
||||
}
|
||||
// SMaLL VoWeLS
|
||||
case 'small vowels' :
|
||||
case 'v' :
|
||||
for(i = 0; i < len; ++i) {
|
||||
c = s[i];
|
||||
if(-1 !== VOWELS.indexOf(c)) {
|
||||
stylized += c.toLowerCase();
|
||||
} else {
|
||||
stylized += c.toUpperCase();
|
||||
}
|
||||
return stylized;
|
||||
}
|
||||
return stylized;
|
||||
|
||||
// bIg vOwELS
|
||||
case 'big vowels' :
|
||||
case 'V' :
|
||||
for(i = 0; i < len; ++i) {
|
||||
c = s[i];
|
||||
if(-1 !== VOWELS.indexOf(c)) {
|
||||
stylized += c.toUpperCase();
|
||||
} else {
|
||||
stylized += c.toLowerCase();
|
||||
}
|
||||
// bIg vOwELS
|
||||
case 'big vowels' :
|
||||
case 'V' :
|
||||
for(i = 0; i < len; ++i) {
|
||||
c = s[i];
|
||||
if(-1 !== VOWELS.indexOf(c)) {
|
||||
stylized += c.toUpperCase();
|
||||
} else {
|
||||
stylized += c.toLowerCase();
|
||||
}
|
||||
return stylized;
|
||||
}
|
||||
return stylized;
|
||||
|
||||
// Small i's: DEMENTiA
|
||||
case 'small i' :
|
||||
case 'i' : return s.toUpperCase().replace(/I/g, 'i');
|
||||
// Small i's: DEMENTiA
|
||||
case 'small i' :
|
||||
case 'i' :
|
||||
return s.toUpperCase().replace(/I/g, 'i');
|
||||
|
||||
// mIxeD CaSE (random upper/lower)
|
||||
case 'mixed' :
|
||||
case 'M' :
|
||||
for(i = 0; i < len; i++) {
|
||||
if(Math.random() < 0.5) {
|
||||
stylized += s[i].toUpperCase();
|
||||
} else {
|
||||
stylized += s[i].toLowerCase();
|
||||
}
|
||||
// mIxeD CaSE (random upper/lower)
|
||||
case 'mixed' :
|
||||
case 'M' :
|
||||
for(i = 0; i < len; i++) {
|
||||
if(Math.random() < 0.5) {
|
||||
stylized += s[i].toUpperCase();
|
||||
} else {
|
||||
stylized += s[i].toLowerCase();
|
||||
}
|
||||
return stylized;
|
||||
}
|
||||
return stylized;
|
||||
|
||||
// l337 5p34k
|
||||
case 'l33t' :
|
||||
case '3' :
|
||||
for(i = 0; i < len; ++i) {
|
||||
c = SIMPLE_ELITE_MAP[s[i].toLowerCase()];
|
||||
stylized += c || s[i];
|
||||
}
|
||||
return stylized;
|
||||
// l337 5p34k
|
||||
case 'l33t' :
|
||||
case '3' :
|
||||
for(i = 0; i < len; ++i) {
|
||||
c = SIMPLE_ELITE_MAP[s[i].toLowerCase()];
|
||||
stylized += c || s[i];
|
||||
}
|
||||
return stylized;
|
||||
}
|
||||
|
||||
return s;
|
||||
|
|
@ -119,45 +122,49 @@ function stylizeString(s, style) {
|
|||
|
||||
// Based on http://www.webtoolkit.info/
|
||||
// :TODO: Look into lodash padLeft, padRight, etc.
|
||||
function pad(s, len, padChar, dir, stringSGR, padSGR) {
|
||||
len = miscUtil.valueWithDefault(len, 0);
|
||||
padChar = miscUtil.valueWithDefault(padChar, ' ');
|
||||
dir = miscUtil.valueWithDefault(dir, 'right');
|
||||
stringSGR = miscUtil.valueWithDefault(stringSGR, '');
|
||||
padSGR = miscUtil.valueWithDefault(padSGR, '');
|
||||
function pad(s, len, padChar, dir, stringSGR, padSGR, useRenderLen) {
|
||||
len = miscUtil.valueWithDefault(len, 0);
|
||||
padChar = miscUtil.valueWithDefault(padChar, ' ');
|
||||
dir = miscUtil.valueWithDefault(dir, 'right');
|
||||
stringSGR = miscUtil.valueWithDefault(stringSGR, '');
|
||||
padSGR = miscUtil.valueWithDefault(padSGR, '');
|
||||
useRenderLen = miscUtil.valueWithDefault(useRenderLen, true);
|
||||
|
||||
var padlen = len >= s.length ? len - s.length : 0;
|
||||
const renderLen = useRenderLen ? renderStringLength(s) : s.length;
|
||||
const padlen = len >= renderLen ? len - renderLen : 0;
|
||||
|
||||
switch(dir) {
|
||||
case 'L' :
|
||||
case 'left' :
|
||||
s = padSGR + new Array(padlen).join(padChar) + stringSGR + s;
|
||||
break;
|
||||
case 'L' :
|
||||
case 'left' :
|
||||
s = padSGR + new Array(padlen).join(padChar) + stringSGR + s;
|
||||
break;
|
||||
|
||||
case 'C' :
|
||||
case 'center' :
|
||||
case 'both' :
|
||||
var right = Math.ceil(padlen / 2);
|
||||
var left = padlen - right;
|
||||
case 'C' :
|
||||
case 'center' :
|
||||
case 'both' :
|
||||
{
|
||||
const right = Math.ceil(padlen / 2);
|
||||
const left = padlen - right;
|
||||
s = padSGR + new Array(left + 1).join(padChar) + stringSGR + s + padSGR + new Array(right + 1).join(padChar);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'R' :
|
||||
case 'right' :
|
||||
s = stringSGR + s + padSGR + new Array(padlen).join(padChar);
|
||||
break;
|
||||
case 'R' :
|
||||
case 'right' :
|
||||
s = stringSGR + s + padSGR + new Array(padlen).join(padChar);
|
||||
break;
|
||||
|
||||
default : break;
|
||||
default : break;
|
||||
}
|
||||
|
||||
return stringSGR + s;
|
||||
}
|
||||
|
||||
function replaceAt(s, n, t) {
|
||||
return s.substring(0, n) + t + s.substring(n + 1);
|
||||
return s.substring(0, n) + t + s.substring(n + 1);
|
||||
}
|
||||
|
||||
var RE_NON_PRINTABLE = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/;
|
||||
const RE_NON_PRINTABLE = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/;
|
||||
|
||||
function isPrintable(s) {
|
||||
//
|
||||
|
|
@ -226,6 +233,58 @@ var stringFormatExtensions = {
|
|||
|
||||
exports.stringFormatExtensions = stringFormatExtensions;
|
||||
|
||||
|
||||
// :TODO: Add other codes from ansi_escape_parser
|
||||
const ANSI_REGEXP = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
|
||||
const ANSI_OR_PIPE_REGEXP = new RegExp(ANSI_REGEXP.source + '\\|[A-Z\d]{2}', 'g');
|
||||
|
||||
//
|
||||
// Similar to substr() but works with ANSI/Pipe code strings
|
||||
//
|
||||
function renderSubstr(str, start, length) {
|
||||
start = start || 0;
|
||||
length = length || str.length - start;
|
||||
|
||||
const re = ANSI_REGEXP;
|
||||
let pos;
|
||||
let match;
|
||||
let out = '';
|
||||
let renderLen = 0;
|
||||
do {
|
||||
pos = re.lastIndex;
|
||||
match = re.exec(str);
|
||||
|
||||
if(match) {
|
||||
if(match.index > pos) {
|
||||
const s = str.slice(pos, match.index - (Math.min(0, length - renderLen)));
|
||||
out += s;
|
||||
renderLen += s.length;
|
||||
}
|
||||
|
||||
out += match[0];
|
||||
}
|
||||
} while(renderLen < length && 0 !== re.lastIndex);
|
||||
|
||||
// remainder
|
||||
if(pos < str.length && renderLen < length) {
|
||||
out += str.slice(pos, pos + Math.max(0, length - renderLen));
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
//
|
||||
// Method to return the "rendered" length taking into account
|
||||
// Pipe and ANSI color codes. Note that currently ANSI *movement*
|
||||
// codes are not considred!
|
||||
//
|
||||
// :TODO: consolidate ANSI code RegExp's and such
|
||||
const PIPE_AND_ANSI_RE = ANSI_OR_PIPE_REGEXP;// /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]|\|[A-Z\d]{2}/g
|
||||
function renderStringLength(str) {
|
||||
return str.replace(PIPE_AND_ANSI_RE, '').length;
|
||||
}
|
||||
|
||||
|
||||
// :TODO: See notes in word_wrap.js about need to consolidate the various ANSI related RegExp's
|
||||
//const REGEXP_ANSI_CONTROL_CODES = /(\x1b\x5b)([\?=;0-9]*?)([0-9A-ORZcf-npsu=><])/g;
|
||||
const REGEXP_ANSI_CONTROL_CODES = /(?:\x1b\x5b)([\?=;0-9]*?)([A-ORZcf-npsu=><])/g;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,19 @@
|
|||
/* jslint node: true */
|
||||
'use strict';
|
||||
|
||||
var View = require('./view.js').View;
|
||||
var miscUtil = require('./misc_util.js');
|
||||
var strUtil = require('./string_util.js');
|
||||
var ansi = require('./ansi_term.js');
|
||||
// ENiGMA½
|
||||
const View = require('./view.js').View;
|
||||
const miscUtil = require('./misc_util.js');
|
||||
const ansi = require('./ansi_term.js');
|
||||
const padStr = require('./string_util.js').pad;
|
||||
const stylizeString = require('./string_util.js').stylizeString;
|
||||
const renderSubstr = require('./string_util.js').renderSubstr;
|
||||
const renderStringLength = require('./string_util.js').renderStringLength;
|
||||
const pipeToAnsi = require('./color_codes.js').pipeToAnsi;
|
||||
|
||||
var util = require('util');
|
||||
var _ = require('lodash');
|
||||
// deps
|
||||
const util = require('util');
|
||||
const _ = require('lodash');
|
||||
|
||||
exports.TextView = TextView;
|
||||
|
||||
|
|
@ -39,6 +45,7 @@ function TextView(options) {
|
|||
this.textMaskChar = options.textMaskChar;
|
||||
}
|
||||
|
||||
/*
|
||||
this.drawText = function(s) {
|
||||
|
||||
//
|
||||
|
|
@ -47,16 +54,11 @@ function TextView(options) {
|
|||
// |ABCDEFG| ^_ this.text.length
|
||||
// ^-- this.dimens.width
|
||||
//
|
||||
var textToDraw = _.isString(this.textMaskChar) ?
|
||||
let textToDraw = _.isString(this.textMaskChar) ?
|
||||
new Array(s.length + 1).join(this.textMaskChar) :
|
||||
strUtil.stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
|
||||
|
||||
// :TODO: Add pipe code support
|
||||
stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
|
||||
|
||||
if(textToDraw.length > this.dimens.width) {
|
||||
// XXXXXXXXXXXXXXXXX
|
||||
// this is the text but too long
|
||||
// text but too long
|
||||
if(this.hasFocus) {
|
||||
if(this.horizScroll) {
|
||||
textToDraw = textToDraw.substr(textToDraw.length - this.dimens.width, textToDraw.length);
|
||||
|
|
@ -75,7 +77,52 @@ function TextView(options) {
|
|||
}
|
||||
}
|
||||
|
||||
this.client.term.write(strUtil.pad(
|
||||
this.client.term.write(padStr(
|
||||
textToDraw,
|
||||
this.dimens.width + 1,
|
||||
this.fillChar,
|
||||
this.justify,
|
||||
this.hasFocus ? this.getFocusSGR() : this.getSGR(),
|
||||
this.getStyleSGR(1) || this.getSGR()
|
||||
), false);
|
||||
};
|
||||
*/
|
||||
this.drawText = function(s) {
|
||||
|
||||
//
|
||||
// |<- this.maxLength
|
||||
// ABCDEFGHIJK
|
||||
// |ABCDEFG| ^_ this.text.length
|
||||
// ^-- this.dimens.width
|
||||
//
|
||||
let renderLength = renderStringLength(s); // initial; may be adjusted below:
|
||||
|
||||
let textToDraw = _.isString(this.textMaskChar) ?
|
||||
new Array(renderLength + 1).join(this.textMaskChar) :
|
||||
stylizeString(s, this.hasFocus ? this.focusTextStyle : this.textStyle);
|
||||
|
||||
renderLength = renderStringLength(textToDraw);
|
||||
|
||||
if(renderLength > this.dimens.width) {
|
||||
if(this.hasFocus) {
|
||||
if(this.horizScroll) {
|
||||
textToDraw = renderSubstr(textToDraw, renderLength - this.dimens.width, renderLength);
|
||||
}
|
||||
} else {
|
||||
if(renderLength > this.dimens.width) {
|
||||
if(this.textOverflow &&
|
||||
this.dimens.width > this.textOverflow.length &&
|
||||
renderLength - this.textOverflow.length >= this.textOverflow.length)
|
||||
{
|
||||
textToDraw = renderSubstr(textToDraw, 0, this.dimens.width - this.textOverflow.length) + this.textOverflow;
|
||||
} else {
|
||||
textToDraw = renderSubstr(textToDraw, 0, this.dimens.width);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.client.term.write(padStr(
|
||||
textToDraw,
|
||||
this.dimens.width + 1,
|
||||
this.fillChar,
|
||||
|
|
@ -117,6 +164,36 @@ TextView.prototype.getData = function() {
|
|||
return this.text;
|
||||
};
|
||||
|
||||
TextView.prototype.setText = function(text) {
|
||||
if(!_.isString(text)) {
|
||||
text = text.toString();
|
||||
}
|
||||
|
||||
text = pipeToAnsi(text, this.client); // expand MCI/etc.
|
||||
|
||||
var widthDelta = 0;
|
||||
if(this.text && this.text !== text) {
|
||||
widthDelta = Math.abs(this.text.length - text.length);
|
||||
}
|
||||
|
||||
this.text = text;
|
||||
|
||||
if(this.maxLength > 0) {
|
||||
this.text = renderSubstr(this.text, 0, this.maxLength);
|
||||
//this.text = this.text.substr(0, this.maxLength);
|
||||
}
|
||||
|
||||
// :TODO: it would be nice to be able to stylize strings with MCI and {special} MCI syntax, e.g. "|BN {UN!toUpper}"
|
||||
this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
|
||||
|
||||
if(this.autoScale.width) {
|
||||
this.dimens.width = this.text.length + widthDelta;
|
||||
}
|
||||
|
||||
this.redraw();
|
||||
};
|
||||
|
||||
/*
|
||||
TextView.prototype.setText = function(text) {
|
||||
if(!_.isString(text)) {
|
||||
text = text.toString();
|
||||
|
|
@ -133,19 +210,27 @@ TextView.prototype.setText = function(text) {
|
|||
this.text = this.text.substr(0, this.maxLength);
|
||||
}
|
||||
|
||||
this.text = strUtil.stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
|
||||
this.text = stylizeString(this.text, this.hasFocus ? this.focusTextStyle : this.textStyle);
|
||||
|
||||
//if(this.resizable) {
|
||||
// this.dimens.width = this.text.length + widthDelta;
|
||||
//}
|
||||
|
||||
/*
|
||||
if(this.resizable) {
|
||||
this.dimens.width = this.text.length + widthDelta;
|
||||
}
|
||||
*/
|
||||
if(this.autoScale.width) {
|
||||
this.dimens.width = this.text.length + widthDelta;
|
||||
}
|
||||
|
||||
this.redraw();
|
||||
};
|
||||
*/
|
||||
|
||||
TextView.prototype.setFormatObject = function(obj) {
|
||||
if(!_.isObject(obj) || !this.text) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.setText(this.text.format(obj));
|
||||
};
|
||||
|
||||
TextView.prototype.clearText = function() {
|
||||
this.setText('');
|
||||
|
|
@ -163,5 +248,6 @@ TextView.prototype.setPropertyValue = function(propName, value) {
|
|||
break;
|
||||
}
|
||||
|
||||
|
||||
TextView.super_.prototype.setPropertyValue.call(this, propName, value);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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( () => {
|
||||
return self.prevMenu(cb);
|
||||
}, 1000);
|
||||
self.prevMenuOnTimeout(1000, cb);
|
||||
} else {
|
||||
return self.prevMenu(cb);
|
||||
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);
|
||||
}
|
||||
}
|
||||
});
|
||||
} 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.
Loading…
Reference in New Issue