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

Fix bug caused by new getView()

This commit is contained in:
Bryan Ashby 2019-06-13 22:54:05 -06:00
parent 4ebbedf4bc
commit 7481421898
No known key found for this signature in database
GPG Key ID: B49EB437951D2542
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/user_config.js
View File

@ -76,12 +76,12 @@ exports.getModule = class UserConfigModule extends MenuModule {
}, },
validatePassConfirmMatch : function(data, cb) { 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')); cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
}, },
viewValidationListener : function(err, cb) { viewValidationListener : function(err, cb) {
var errMsgView = self.getView(MciCodeIds.ErrorMsg); var errMsgView = self.getMenuView(MciCodeIds.ErrorMsg);
var newFocusId; var newFocusId;
if(errMsgView) { if(errMsgView) {
if(err) { if(err) {
@ -89,7 +89,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
if(err.view.getId() === MciCodeIds.PassConfirm) { if(err.view.getId() === MciCodeIds.PassConfirm) {
newFocusId = MciCodeIds.Password; newFocusId = MciCodeIds.Password;
var passwordView = self.getView(MciCodeIds.Password); var passwordView = self.getMenuView(MciCodeIds.Password);
passwordView.clearText(); passwordView.clearText();
err.view.clearText(); err.view.clearText();
} }
@ -150,7 +150,7 @@ exports.getModule = class UserConfigModule extends MenuModule {
}; };
} }
getView(viewId) { getMenuView(viewId) {
return this.viewControllers.menu.getView(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()); self.setViewText('menu', MciCodeIds.TermHeight, user.properties[UserProps.TermHeight].toString());
var themeView = self.getView(MciCodeIds.Theme); var themeView = self.getMenuView(MciCodeIds.Theme);
if(themeView) { if(themeView) {
themeView.setItems(_.map(self.availThemeInfo, 'name')); themeView.setItems(_.map(self.availThemeInfo, 'name'));
themeView.setFocusItemIndex(currentThemeIdIndex); themeView.setFocusItemIndex(currentThemeIdIndex);
} }
var realNameView = self.getView(MciCodeIds.RealName); var realNameView = self.getMenuView(MciCodeIds.RealName);
if(realNameView) { if(realNameView) {
realNameView.setFocus(true); // :TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix! realNameView.setFocus(true); // :TODO: HACK! menu.hjson sets focus, but manual population above breaks this. Needs a real fix!
} }