Merge branch 'master' into FILE_BASE

This commit is contained in:
Bryan Ashby 2017-02-15 21:46:35 -07:00
commit f80492d869
2 changed files with 60 additions and 16 deletions

View file

@ -8,6 +8,7 @@ const ansi = require('./ansi_term.js');
const theme = require('./theme.js');
const Message = require('./message.js');
const updateMessageAreaLastReadId = require('./message_area.js').updateMessageAreaLastReadId;
const getMessageAreaByTag = require('./message_area.js').getMessageAreaByTag;
const getUserIdAndName = require('./user.js').getUserIdAndName;
const cleanControlCodes = require('./string_util.js').cleanControlCodes;
const StatLog = require('./stat_log.js');
@ -658,8 +659,14 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
break;
case 'edit' :
self.viewControllers.header.getView(1).setText(self.client.user.username); // from
const fromView = self.viewControllers.header.getView(1);
const area = getMessageAreaByTag(self.messageAreaTag);
if(area && area.realNames) {
fromView.setText(self.client.user.properties.real_name || self.client.user.username);
} else {
fromView.setText(self.client.user.username);
}
if(self.replyToMessage) {
self.initHeaderReplyEditMode();
}