* Fix short timeFormat

* Pause prompts now support MCI codes using View Controller
* View Controller 'noInput' option for read-only/viewable but no interaction
* Ability to omit final trailing CRLF's in ANSI's
* Move asset.displayArtAsset -> theme.displayThemedAsset
This commit is contained in:
Bryan Ashby 2015-07-25 16:10:12 -06:00
parent dd478ed6ba
commit 35a99b7e3e
10 changed files with 125 additions and 154 deletions

View file

@ -7,7 +7,6 @@ var ansi = require('../core/ansi_term.js');
var theme = require('../core/theme.js');
var MultiLineEditTextView = require('../core/multi_line_edit_text_view.js').MultiLineEditTextView;
var Message = require('../core/message.js');
var asset = require('../core/asset.js');
var async = require('async');
var assert = require('assert');
@ -103,19 +102,14 @@ function FullScreenEditorModule(options) {
function displayFooterArt(callback) {
var footerArt = self.menuConfig.config.art[options.footerName];
asset.displayArtAsset(
theme.displayThemedAsset(
footerArt,
self.client,
function displayed(err, artData)
{
{ font : self.menuConfig.font },
function displayed(err, artData) {
callback(err, artData);
});
/*
self.displayArtAsset(footerArt, function artDisplayed(err, artData) {
callback(err, artData);
});
*/
}
);
}
],
function complete(err, artData) {
@ -134,18 +128,14 @@ function FullScreenEditorModule(options) {
[
function displayHeaderAndBody(callback) {
async.eachSeries( comps, function dispArt(n, next) {
asset.displayArtAsset(
theme.displayThemedAsset(
art[n],
self.client,
{ font : self.menuConfig.font },
function displayed(err, artData) {
next(err);
});
/*
self.displayArtAsset(art[n], function artDisplayed(err, artData) {
next(err);
});
*/
}
);
}, function complete(err) {
callback(err);
});
@ -218,20 +208,15 @@ function FullScreenEditorModule(options) {
assert(_.isString(art.body));
async.eachSeries( [ 'header', 'body' ], function dispArt(n, next) {
asset.displayArtAsset(
theme.displayThemedAsset1(
art[n],
self.client,
{ font : self.menuConfig.font },
function displayed(err, artData) {
mciData[n] = artData;
next(err);
});
/*
self.displayArtAsset(art[n], function artDisplayed(err, artData) {
mciData[n] = artData;
next(err);
});
*/
}
);
}, function complete(err) {
callback(err);
});