btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge pull request #216 from mateusppereira/bug-fix-frame-colors

Browse Source 
Fixed frame colors toggle
This commit is contained in:
John Harker
2019-10-25 19:47:17 +01:00
committed by GitHub
parent fa268fd092 9103ceeb1e
commit 84eda99dc0
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/section.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<fieldset :id="label.toLowerCase()" :class="{ 'no-colored-frames': noFrameColors }"> <fieldset :id="label.toLowerCase()" :class="{ 'no-colored-frames': !frameColorsEnabled }">
<legend @click.prevent="collapse"> <legend @click.prevent="collapse">
<i class="material-icons icon">{{ icon }}</i> <i class="material-icons icon">{{ icon }}</i>
<span>{{ label }}</span> <span>{{ label }}</span>
@@ -24,8 +24,8 @@
<script> <script>
export default { export default {
computed: { computed: {
noFrameColors() { frameColorsEnabled() {
return this.$store.state.postwoman.settings.DISABLE_FRAME_COLORS || false; return this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false;
} }
}, },

12
pages/settings.vue
View File

@@ -40,9 +40,9 @@
<h3 class="title">Frames</h3> <h3 class="title">Frames</h3>
<span> <span>
<pw-toggle <pw-toggle
:on="!settings.DISABLE_FRAME_COLORS" :on="settings.FRAME_COLORS_ENABLED"
@change="applySetting('DISABLE_FRAME_COLORS', $event)" @change="toggleSetting('FRAME_COLORS_ENABLED')"
>Multi-color {{ settings.DISABLE_FRAME_COLORS ? "Disabled" : "Enabled" }}</pw-toggle> >Multi-color {{ settings.FRAME_COLORS_ENABLED ? "Enabled" : "Disabled" }}</pw-toggle>
</span> </span>
</li> </li>
</ul> </ul>
@@ -52,7 +52,7 @@
<li> <li>
<pw-toggle <pw-toggle
:on="settings.PROXY_ENABLED" :on="settings.PROXY_ENABLED"
@change="applySetting('PROXY_ENABLED', $event)" @change="toggleSetting('PROXY_ENABLED')"
>Proxy {{ settings.PROXY_ENABLED ? "enabled" : "disabled" }}</pw-toggle> >Proxy {{ settings.PROXY_ENABLED ? "enabled" : "disabled" }}</pw-toggle>
</li> </li>
</ul> </ul>
@@ -166,8 +166,8 @@
THEME_COLOR: "", THEME_COLOR: "",
THEME_COLOR_VIBRANT: true, THEME_COLOR_VIBRANT: true,
DISABLE_FRAME_COLORS: FRAME_COLORS_ENABLED:
this.$store.state.postwoman.settings.DISABLE_FRAME_COLORS || false, this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false,
PROXY_ENABLED: PROXY_ENABLED:
this.$store.state.postwoman.settings.PROXY_ENABLED || false, this.$store.state.postwoman.settings.PROXY_ENABLED || false,
PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || "", PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || "",

2
store/postwoman.js
View File

@@ -26,7 +26,7 @@ export const SETTINGS_KEYS = [
* to emphasise the different sections. * to emphasise the different sections.
* This setting allows that to be turned off. * This setting allows that to be turned off.
*/ */
"DISABLE_FRAME_COLORS", "FRAME_COLORS_ENABLED",
/** /**
* Whether or not requests should be proxied. * Whether or not requests should be proxied.