Skip to content

Commit

Permalink
Fixed rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
susuhahnml committed Oct 28, 2023
1 parent 38b66e9 commit 7ee3693
Showing 1 changed file with 17 additions and 16 deletions.
33 changes: 17 additions & 16 deletions angular_frontend/src/app/callback-helper.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ function handleUpdate(when:WhenDto, event: Event | null) {

} else {
console.log("COULD NOT FIND ELEMENT FOR when:" + id + "::" + key + "::" + value)
console.log(when)
}


Expand Down Expand Up @@ -335,25 +336,25 @@ export class CallBackHelperService {
return 0;
});

const updates = allEvents.filter((w) => w.interactionType == "update"|| w.interactionType == "context")
const updates = allEvents.filter((w) => w.interactionType == "update")
const context = allEvents.filter((w) => w.interactionType == "context")
const call = allEvents.filter((w) => w.interactionType == "call" || w.interactionType == "callback")
const context_menu = allEvents.filter((w) => w.interactionType == "show_context_menu" )
// const context_menu = allEvents.filter((w) => w.interactionType == "show_context_menu" )

context_menu.forEach((when:WhenDto) => {
try{
if (when.interactionType == "update") {
handleUpdate(when, event)
} else if (when.interactionType == "context") {
handleContext(when, event)
} else if (when.interactionType == "call" || when.interactionType == "callback") {
handleCallback(when, event)
}
}catch(error:any){
let frontendService = LocatorService.injector.get(DrawFrontendService)
frontendService.postMessage(error.message,"warning")
}
})
// context_menu.forEach((when:WhenDto) => {
// try{
// if (when.interactionType == "update") {
// handleUpdate(when, event)
// } else if (when.interactionType == "context") {
// handleContext(when, event)
// } else if (when.interactionType == "call" || when.interactionType == "callback") {
// handleCallback(when, event)
// }
// }catch(error:any){
// let frontendService = LocatorService.injector.get(DrawFrontendService)
// frontendService.postMessage(error.message,"warning")
// }
// })

updates.forEach((when:WhenDto) => {
try{
Expand Down

0 comments on commit 7ee3693

Please sign in to comment.