zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-08-04 08:51:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Sync up with master

Browse source
This commit is contained in:
Bryan Ashby 2020-07-05 17:57:29 -06:00
commit 91166b7f6b
No known key found for this signature in database
GPG key ID: B49EB437951D2542
19 changed files with 76 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/acs_parser.js
View file

@ -1055,6 +1055,14 @@ function peg$parse(input, options) {
}
const points = user.getPropertyAsNumber(UserProps.AchievementTotalPoints) || 0;
return !isNan(value) && points >= value;
},
PV : function userPropValue() {
if (!user || !Array.isArray(value) || value.length !== 2) {
return false;
}
const [propName, propValue] = value;
const actualPropValue = user.getProperty(propName);
return actualPropValue === propValue;
}
}[acsCode](value);
} catch (e) {

10
core/msg_list.js
View file

@ -60,13 +60,14 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
this.menuMethods = {
selectMessage : (formData, extraArgs, cb) => {
if(MciViewIds.allViews.msgList === formData.submitId) {
this.initialFocusIndex = formData.value.message;
this.initialFocusIndex = formData.value.messageIndex ||
formData.value.message; // older deprecated arg name
const modOpts = {
extraArgs : {
messageAreaTag : this.getSelectedAreaTag(formData.value.message),
messageAreaTag : this.getSelectedAreaTag(this.initialFocusIndex),
messageList : this.config.messageList,
messageIndex : formData.value.message,
messageIndex : this.initialFocusIndex,
lastMessageNextExit : true,
}
};
@ -107,7 +108,8 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
if(MciViewIds.allViews.msgList != formData.submitId) {
return cb(null);
}
const messageIndex = _.get(formData, 'value.message');
const messageIndex = formData.value.messageIndex ||
formData.value.message; // older, deprecated arg name
return this.promptDeleteMessageConfirm(messageIndex, cb);
},
deleteMessageYes : (formData, extraArgs, cb) => {