diff options
Diffstat (limited to 'extension/src')
-rw-r--r-- | extension/src/entries/contentScript/primary/components/PromptPopup.vue | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/extension/src/entries/contentScript/primary/components/PromptPopup.vue b/extension/src/entries/contentScript/primary/components/PromptPopup.vue index b2415b9..54b3778 100644 --- a/extension/src/entries/contentScript/primary/components/PromptPopup.vue +++ b/extension/src/entries/contentScript/primary/components/PromptPopup.vue @@ -83,7 +83,6 @@ </div> </div> </div> - </div> </template> @@ -91,6 +90,7 @@ import { ref, shallowRef } from 'vue' import { storeToRefs } from 'pinia'; import { computed } from 'vue'; +import { get, set } from '@vueuse/core'; import { Popover, PopoverButton, PopoverPanel } from '@headlessui/vue' import { clone, first, isEqual } from 'lodash'; import { useStore } from '../../../store'; @@ -118,7 +118,6 @@ const event = computed<PropmtMessage | undefined>(() => { return getPromptMessage(pending) }); -const site = computed(() => new URL(event.value?.origin || "https://example.com").host) const evData = computed(() => JSON.stringify(event.value || {}, null, 2)) const onSameOrigin = computed(() => isEqual(event.value?.origin, window.location.origin)) @@ -126,6 +125,8 @@ const onSameOrigin = computed(() => isEqual(event.value?.origin, window.location const showPopup = computed(() => (store.permissions.isPopup || !store.settings.authPopup)) const showPrompt = computed(() => (onSameOrigin.value || store.permissions.isPopup) && event.value) +const site = computed(() => get(showPrompt) ? new URL(event.value?.origin || "https://example.com").host : "") + const close = () => { if(event.value){ store.plugins.permission.deny(event.value.uuid); @@ -140,7 +141,7 @@ const allow = () => { store.plugins.permission.allow(event.value.uuid, allowRuleType.value); } //Reset the rule type - allowRuleType.value = CreateRuleType.AllowOnce + set(allowRuleType, CreateRuleType.AllowOnce); } //Listen for events @@ -193,15 +194,16 @@ const getRuleName = (rule: CreateRuleType) => { } } -const createOption = (rule: CreateRuleType): Option<CreateRuleType> => { - return { name: getRuleName(rule), value: rule } -} +const lbOptions = ((): OptionGroup<CreateRuleType>[] => { -const creatGroup = (name: string, options: Option<CreateRuleType>[]): OptionGroup<CreateRuleType> => { - return { name, options } -} + const createOption = (rule: CreateRuleType): Option<CreateRuleType> => { + return { name: getRuleName(rule), value: rule } + } + + const creatGroup = (name: string, options: Option<CreateRuleType>[]): OptionGroup<CreateRuleType> => { + return { name, options } + } -const lbOptions = ((): OptionGroup<CreateRuleType>[] => { return[ creatGroup('Allow', [ createOption(CreateRuleType.AllowOnce), |