From 7481421898d9e17240b4c655046e3574eb81f04a Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Thu, 13 Jun 2019 22:54:05 -0600 Subject: [PATCH] Fix bug caused by new getView() --- core/user_config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/user_config.js b/core/user_config.js index d2748c4b..ca3b20ff 100644 --- a/core/user_config.js +++ b/core/user_config.js @@ -76,12 +76,12 @@ exports.getModule = class UserConfigModule extends MenuModule { }, validatePassConfirmMatch : function(data, cb) { - var passwordView = self.getView(MciCodeIds.Password); + var passwordView = self.getMenuView(MciCodeIds.Password); cb(passwordView.getData() === data ? null : new Error('Passwords do not match')); }, viewValidationListener : function(err, cb) { - var errMsgView = self.getView(MciCodeIds.ErrorMsg); + var errMsgView = self.getMenuView(MciCodeIds.ErrorMsg); var newFocusId; if(errMsgView) { if(err) { @@ -89,7 +89,7 @@ exports.getModule = class UserConfigModule extends MenuModule { if(err.view.getId() === MciCodeIds.PassConfirm) { newFocusId = MciCodeIds.Password; - var passwordView = self.getView(MciCodeIds.Password); + var passwordView = self.getMenuView(MciCodeIds.Password); passwordView.clearText(); err.view.clearText(); } @@ -150,7 +150,7 @@ exports.getModule = class UserConfigModule extends MenuModule { }; } - getView(viewId) { + getMenuView(viewId) { return this.viewControllers.menu.getView(viewId); } @@ -200,13 +200,13 @@ exports.getModule = class UserConfigModule extends MenuModule { self.setViewText('menu', MciCodeIds.TermHeight, user.properties[UserProps.TermHeight].toString()); - var themeView = self.getView(MciCodeIds.Theme); + var themeView = self.getMenuView(MciCodeIds.Theme); if(themeView) { themeView.setItems(_.map(self.availThemeInfo, 'name')); themeView.setFocusItemIndex(currentThemeIdIndex); } - var realNameView = self.getView(MciCodeIds.RealName); + var realNameView = self.getMenuView(MciCodeIds.RealName); if(realNameView) { realNameView.setFocus(true); // :TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix! }