Merge pull request hoppscotch#216 from mateusppereira/bug-fix-frame-c…

…olors Fixed frame colors toggle
volf52 · Oct 25, 2019 · 84eda99 · 84eda99
2 parents fa268fd + 9103cee
commit 84eda99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/components/section.vue b/components/section.vue
@@ -1,5 +1,5 @@
 <template>
-  <fieldset :id="label.toLowerCase()" :class="{ 'no-colored-frames': noFrameColors }">
+  <fieldset :id="label.toLowerCase()" :class="{ 'no-colored-frames': !frameColorsEnabled }">
     <legend @click.prevent="collapse">
       <i class="material-icons icon">{{ icon }}</i>
       <span>{{ label }}</span>
@@ -24,8 +24,8 @@
 <script>
   export default {
     computed: {
-      noFrameColors() {
-        return this.$store.state.postwoman.settings.DISABLE_FRAME_COLORS || false;
+      frameColorsEnabled() {
+        return this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false;
       }
     },
 

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

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