wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-22 16:27:22 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

TSK-1460 Disable inbox popup (#3155)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-05-10 19:05:57 +06:00 committed by GitHub
parent 9a36559fe2
commit 30980a8556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/workbench-resources/src/components/Workbench.svelte
View File

@ -505,6 +505,7 @@
$: checkInbox($popupstore) $: checkInbox($popupstore)
let inboxPopup: PopupResult | undefined = undefined let inboxPopup: PopupResult | undefined = undefined
let lastLoc: Location | undefined = undefined
</script> </script>
{#if employee?.active === true} {#if employee?.active === true}
@ -558,23 +559,29 @@
selected={currentAppAlias === notificationId || inboxPopup !== undefined} selected={currentAppAlias === notificationId || inboxPopup !== undefined}
on:click={(e) => { on:click={(e) => {
if (e.metaKey || e.ctrlKey) return if (e.metaKey || e.ctrlKey) return
if (inboxPopup) { // if (inboxPopup) {
inboxPopup.close() // inboxPopup.close()
} else { // } else {
inboxPopup = showPopup( // inboxPopup = showPopup(
notification.component.Inbox, // notification.component.Inbox,
{ visibileNav: true }, // { visibileNav: true },
'content', // 'content',
undefined, // undefined,
undefined, // undefined,
{ // {
category: 'popup', // category: 'popup',
overlay: false // overlay: false
} // }
) // )
} // }
if (currentAppAlias === notificationId && lastLoc !== undefined) {
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
navigate(lastLoc)
lastLoc = undefined
} else {
lastLoc = $location
}
}} }}
notify={hasNotification} notify={hasNotification}
/> />