VDMDI/CT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix context bug

Browse Source
This commit is contained in:
marlon-erler
2026-09-30 15:42:40 +02:00
parent ec135e6d26
commit 6079227356
6 changed files with 68 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Vendored
+12 -5
View File
@@ -1438,9 +1438,9 @@
let exitNext = false;
while (this.contexts.length > 0) {
const currentContext = this.context;
if (!currentContext) return;
if (!currentContext) break;
const response = currentContext.handleContextClose(fromHistoryEvent);
if (response == false) return;
if (response == false) break;
this.contextStack.delete(currentContext.contextId);
if (response == true) {
exitNext = true;
@@ -4629,6 +4629,11 @@
this.secondaryChannels.add(secondaryChannel);
}
};
// context
this.handleContextClose = (fromHistoryEvent) => {
if (!fromHistoryEvent) return;
return true;
};
this.preloadData();
this.cannotSetEncryptionKey = createProxyState(
[this.encryptionKeyInput],
@@ -4961,9 +4966,11 @@
};
// context
this.handleContextClose = (fromHistoryEvent) => {
if (this.replyViewSelectedMessage.value == void 0 && fromHistoryEvent) return true;
this.resetReplyView();
return false;
if (fromHistoryEvent) {
if (this.replyViewSelectedMessage.value == void 0) return true;
this.resetReplyView();
return false;
}
};
this.restoreFilter();
this.cannotSendMessage = createProxyState(
dist/sw.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
const VERSION = "2610 Beta 21.9"
const VERSION = "2610 Beta 21.11"
function processUrl(event) {
const url = event.request.url;
dist/version.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
2610 Beta 21.9
2610 Beta 21.11
src/ViewModel/Global/coreViewModel.ts
+3 -4
View File
@@ -56,17 +56,16 @@ export default class CoreViewModel {
while (this.contexts.length > 0) {
const currentContext: Context | undefined = this.context;
if (!currentContext) return;
if (!currentContext) break;
const response = currentContext.handleContextClose(fromHistoryEvent);
if (response == false) return;
if (response == false) break;
this.contextStack.delete(currentContext.contextId);
if (response == true) {
exitNext = true;
continue;
} else if (exitNext == true) {
break
}
else if (currentContext.contextId == contextId) {
} else if (currentContext.contextId == contextId) {
break;
}
}
src/ViewModel/Pages/messagePageViewModel.ts
+45 -42
View File
@@ -198,57 +198,60 @@ export default class MessagePageViewModel extends Context {
// context
handleContextClose = (fromHistoryEvent: boolean):boolean=> {
if (this.replyViewSelectedMessage.value == undefined && fromHistoryEvent) return true;
this.resetReplyView();
return false;
if (fromHistoryEvent) {
if (this.replyViewSelectedMessage.value == undefined) return true;
this.resetReplyView();
return false;
}
}
// init
constructor(
public readonly coreViewModel: CoreViewModel,
public readonly chatViewModel: ChatViewModel,
public readonly contactListViewModel: ContactListViewModel,
public readonly coreViewModel: CoreViewModel,
public readonly chatViewModel: ChatViewModel,
public readonly contactListViewModel: ContactListViewModel,
) {
super("message-page");
this.restoreFilter();
super("message-page");
this.restoreFilter();
// states
this.cannotSendMessage = React.createProxyState(
[
this.chatViewModel.settingsViewModel.username,
this.composingMessage,
],
() =>
this.chatViewModel.settingsViewModel.username.value == "" ||
this.composingMessage.value == "",
);
// states
this.cannotSendMessage = React.createProxyState(
[
this.chatViewModel.settingsViewModel.username,
this.composingMessage,
],
() =>
this.chatViewModel.settingsViewModel.username.value == "" ||
this.composingMessage.value == "",
);
this.searchViewModel = new SearchViewModel(
this.chatMessageViewModels,
this.filteredMessageViewModels,
(chatMessageViewModel) => [chatMessageViewModel.body.value],
new React.ListState(),
);
this.searchViewModel = new SearchViewModel(
this.chatMessageViewModels,
this.filteredMessageViewModels,
(chatMessageViewModel) => [chatMessageViewModel.body.value],
new React.ListState(),
);
this.isFilterActive = React.createProxyState(
[this.searchViewModel.appliedQuery, this.reactionFilter],
() =>
this.searchViewModel.appliedQuery.value != "" ||
this.reactionFilter.value != undefined,
);
this.isFilterActive = React.createProxyState(
[this.searchViewModel.appliedQuery, this.reactionFilter],
() =>
this.searchViewModel.appliedQuery.value != "" ||
this.reactionFilter.value != undefined,
);
// keystrokes
this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal);
this.registerKeyStroke(CommonKeys.CloseOrCancel, () => {
if (this.isFilterModalOpen.value == true) {
this.hideFilterModal();
} else {
this.replyingMessage.value = undefined;
}
});
this.registerKeyStroke(CommonKeys.Reset, this.resetFilter);
this.registerKeyStroke(CommonKeys.Create, this.setFocus);
// keystrokes
this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal);
this.registerKeyStroke(CommonKeys.CloseOrCancel, () => {
if (this.isFilterModalOpen.value == true) {
this.hideFilterModal();
} else {
this.replyingMessage.value = undefined;
}
});
this.registerKeyStroke(CommonKeys.Reset, this.resetFilter);
this.registerKeyStroke(CommonKeys.Create, this.setFocus);
this.chatViewModel.registerContext(ChatPageTypes.Messages, this);
this.chatViewModel.registerContext(ChatPageTypes.Messages, this);
}
}
src/ViewModel/Pages/settingsPageViewModel.ts
+6
View File
@@ -115,6 +115,12 @@ export default class SettingsPageViewModel extends Context {
}
};
// context
handleContextClose = (fromHistoryEvent: boolean): void | boolean => {
if (!fromHistoryEvent) return;
return true;
}
// init
constructor(
public readonly coreViewModel: CoreViewModel,