From a829905c6319cb927bc912adaa5b19cfc13b2ef9 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 30 Jan 2023 22:13:38 -0700 Subject: [PATCH] New convienience functions on toggle menus, allow paths in sys module search --- core/activitypub/actor.js | 1 + core/asset.js | 2 +- core/toggle_menu_view.js | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/core/activitypub/actor.js b/core/activitypub/actor.js index f9079eb0..efe8c4b9 100644 --- a/core/activitypub/actor.js +++ b/core/activitypub/actor.js @@ -135,6 +135,7 @@ module.exports = class Actor extends ActivityPubObject { bbsInfo: { boardName: Config().general.boardName, memberSince: user.getProperty(UserProps.AccountCreated), + affiliations: user.getProperty(UserProps.Affiliations) || '', }, }; diff --git a/core/asset.js b/core/asset.js index 21cd1925..71acae73 100644 --- a/core/asset.js +++ b/core/asset.js @@ -30,7 +30,7 @@ const ALL_ASSETS = [ ]; const ASSET_RE = new RegExp( - '^@(' + ALL_ASSETS.join('|') + ')' + /:(?:([^:]+):)?([A-Za-z0-9_\-.]+)$/.source + '^@(' + ALL_ASSETS.join('|') + ')' + /:(?:([^:]+):)?([A-Za-z0-9_\-./]+)$/.source ); function parseAsset(s) { diff --git a/core/toggle_menu_view.js b/core/toggle_menu_view.js index 280056c6..ad096152 100644 --- a/core/toggle_menu_view.js +++ b/core/toggle_menu_view.js @@ -77,6 +77,28 @@ ToggleMenuView.prototype.setFocusItemIndex = function (index) { this.updateSelection(); }; +ToggleMenuView.prototype.setTrue = function () { + this.setFocusItemIndex(0); + this.updateSelection(); +}; + +ToggleMenuView.prototype.setFalse = function () { + this.setFocusItemIndex(1); + this.updateSelection(); +}; + +ToggleMenuView.prototype.setFromBoolean = function (bool) { + return bool ? this.setTrue() : this.setFalse(); +}; + +ToggleMenuView.prototype.setYes = function () { + return this.setTrue(); +}; + +ToggleMenuView.prototype.setNo = function () { + return this.setFalse(); +}; + ToggleMenuView.prototype.setFocus = function (focused) { ToggleMenuView.super_.prototype.setFocus.call(this, focused);