crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up some merge mistakes

Browse Source
This commit is contained in:
Bryan Ashby
2022-06-12 14:11:36 -06:00
parent e0fca9f8f7
commit c93b8cda81
3 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/theme.js
View File

@@ -364,7 +364,6 @@ exports.ThemeManager = class ThemeManager {
const format = Config().theme.timeFormat[style] || 'h:mm a'; const format = Config().theme.timeFormat[style] || 'h:mm a';
return _.get(theme, `customization.defaults.timeFormat.${style}`, format); return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
}, },
<<<<<<< HEAD
getDateTimeFormat : function(style = 'short') { getDateTimeFormat : function(style = 'short') {
const format = Config().theme.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a'; const format = Config().theme.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format); return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
@@ -376,16 +375,6 @@ exports.ThemeManager = class ThemeManager {
getStatusVisibleIndicators : function() { getStatusVisibleIndicators : function() {
const format = Config().theme.statusVisibleIndicators || [ 'Y', 'N' ]; const format = Config().theme.statusVisibleIndicators || [ 'Y', 'N' ];
return _.get(theme, 'customization.defaults.statusVisibleIndicators', format); return _.get(theme, 'customization.defaults.statusVisibleIndicators', format);
=======
getDateTimeFormat: function (style = 'short') {
const format =
Config().theme.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
return _.get(
theme,
`customization.defaults.dateTimeFormat.${style}`,
format
);
>>>>>>> 7c01946d6e8ac0023e9692744803466aa96cbadf
}, },
}; };
} }

3
core/user_config.js
View File

@@ -152,7 +152,8 @@ exports.getModule = class UserConfigModule extends MenuModule {
} else { } else {
self.client.log.info(`User "${self.client.user.username}" updated authentication credentials`); self.client.log.info(`User "${self.client.user.username}" updated authentication credentials`);
} }
); return self.prevMenu(cb);
});
} else { } else {
return self.prevMenu(cb); return self.prevMenu(cb);
} }

8
core/view_controller.js
View File

@@ -262,9 +262,7 @@ function ViewController(options) {
let submitId; let submitId;
let initialFocusId = 1; let initialFocusId = 1;
async.each( async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
Object.keys(config.mci || {}),
function entry(mci, nextItem) {
const mciMatch = mci.match(MCI_REGEXP); // :TODO: How to handle auto-generated IDs???? const mciMatch = mci.match(MCI_REGEXP); // :TODO: How to handle auto-generated IDs????
if(null === mciMatch) { if(null === mciMatch) {
self.client.log.warn( { mci : mci }, 'Unable to parse MCI code'); self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
@@ -305,10 +303,10 @@ function ViewController(options) {
if(highestIdView) { if(highestIdView) {
highestIdView.submit = true; highestIdView.submit = true;
} }
}
return cb(err, { initialFocusId : initialFocusId } ); return cb(err, { initialFocusId : initialFocusId } );
} });
);
}; };
// method for comparing submitted form data to configuration entries // method for comparing submitted form data to configuration entries