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

Fixed focus and minor changes

This commit is contained in:
Nathan Byrd 2023-02-03 16:14:45 -06:00
parent 95250d23f2
commit 00e6b41a3e
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/themes/luciano_blocktronics/activitypub_actor_search_main.ans
View File

Binary file not shown.

4
art/themes/luciano_blocktronics/theme.hjson
View File

@ -472,6 +472,7 @@
BT2: {
width: 20
focusTextStyle: upper
submit: true
}
}
}
@ -496,16 +497,19 @@
width: 4
}
MT7: {
focus: true
width: 69
height: 3
mode: preview
}
BT8: {
focusTextStyle: upper
submit: true
}
BT9: {
text: back
focusTextStyle: upper
submit: true
}
}
}

23
core/activitypub/actor_search.js
View File

@ -22,7 +22,7 @@ const FormIds = {
const MciViewIds = {
main: {
searchUrl: 1,
searchOrCancel: 2,
searchButton: 2,
},
view: {
userName: 1,
@ -51,11 +51,8 @@ exports.getModule = class ActivityPubActorSearch extends MenuModule {
case MciViewIds.main.searchUrl: {
return this._search(formData.value, cb);
}
case MciViewIds.main.searchOrCancel: {
const search = get(formData, 'value.searchOrCancel') === 0;
return search
? this._search(formData.value, cb)
: this.prevMenu(cb);
case MciViewIds.main.searchButton: {
return this._search(formData.value, cb);
}
default:
@ -105,11 +102,20 @@ exports.getModule = class ActivityPubActorSearch extends MenuModule {
async.series(
[
callback => {
if (this.viewControllers.main) {
this.viewControllers.main.setFocus(false);
}
return this.displayArtAndPrepViewController(
'view',
FormIds.view,
{ clearScreen: true },
callback
(err, artInfo, wasCreated) => {
if (!err && !wasCreated) {
this.viewControllers.view.setFocus(true);
}
return callback(err);
}
);
},
callback => {
@ -151,10 +157,11 @@ exports.getModule = class ActivityPubActorSearch extends MenuModule {
const summaryView = v(MciViewIds.view.summary);
summaryView.setText(htmlToMessageBody(remoteActor.summary));
summaryView.redraw();
const followButtonView = v(MciViewIds.view.followButton);
// TODO: FIXME: Real status
followButtonView.setText('Follow');
followButtonView.setText('follow');
return callback(null);
},