tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix options and popup pages

Browse Source
This commit is contained in:
Tamius Han 2020-11-30 00:37:45 +01:00
parent 27e03115d2
commit ada7e69abd
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/popup/App.vue
View File

@ -29,7 +29,7 @@
<div class=""> <div class="">
Site settings Site settings
</div> </div>
<div v-if="selectedTab === 'site' && this.activeSites.length > 1" <div v-if="selectedTab === 'site' && activeSites.length > 1"
class="" class=""
> >
<small>Select site to control:</small> <small>Select site to control:</small>
@ -55,7 +55,7 @@
<div class=""> <div class="">
Video settings <span v-if="canShowVideoTab.canShow && canShowVideoTab.warning" class="warning-color">⚠</span> Video settings <span v-if="canShowVideoTab.canShow && canShowVideoTab.warning" class="warning-color">⚠</span>
</div> </div>
<div v-if="selectedTab === 'video' && this.activeFrames.length > 0" <div v-if="selectedTab === 'video' && activeFrames.length > 0"
class="" class=""
> >
<small>Select embedded frame to control:</small> <small>Select embedded frame to control:</small>
@ -82,7 +82,7 @@
<div class=""> <div class="">
Advanced settings Advanced settings
</div> </div>
<div v-if="selectedTab === 'site-details' && this.activeSites.length > 1" <div v-if="selectedTab === 'site-details' && activeSites.length > 1"
class="" class=""
> >
<small>Select site to control:</small> <small>Select site to control:</small>
@ -137,7 +137,7 @@
<!-- PANELS/CONTENT --> <!-- PANELS/CONTENT -->
<div id="tab-content" class="flex-grow h100 overflow-y-auto"> <div id="tab-content" class="flex-grow h100 overflow-y-auto">
<VideoPanel v-if="settings && settings.active && selectedTab === 'video'" <VideoPanel v-if="settings?.active && selectedTab === 'video'"
class="" class=""
:someSitesDisabledWarning="canShowVideoTab.warning" :someSitesDisabledWarning="canShowVideoTab.warning"
:settings="settings" :settings="settings"
@ -145,7 +145,7 @@
:zoom="currentZoom" :zoom="currentZoom"
@zoom-change="updateZoom($event)" @zoom-change="updateZoom($event)"
/> />
<DefaultSettingsPanel v-if="settings && settings.active && (selectedTab === 'site' || selectedTab === 'global')" <DefaultSettingsPanel v-if="settings?.active && (selectedTab === 'global' || selectedTab === 'site')"
class="" class=""
:settings="settings" :settings="settings"
:scope="selectedTab" :scope="selectedTab"
@ -325,6 +325,7 @@ export default {
if (!this.site || this.site.host !== message.site.host) { if (!this.site || this.site.host !== message.site.host) {
this.port.postMessage({cmd: 'get-current-zoom'}); this.port.postMessage({cmd: 'get-current-zoom'});
} }
console.log("processing received message:", message)
this.site = message.site; this.site = message.site;
// update activeSites // update activeSites

2
src/popup/panels/DefaultSettingsPanel.vue
View File

@ -147,7 +147,6 @@ export default {
components: { components: {
ShortcutButton, ShortcutButton,
}, },
watch: { watch: {
settings: { settings: {
deep: true, deep: true,
@ -172,7 +171,6 @@ export default {
let site; let site;
if (this.scope === 'global') { if (this.scope === 'global') {
site = '@global' site = '@global'
this.site = site;
} else { } else {
if (!this.site) { if (!this.site) {
return ''; return '';