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

Merge branch 'master' into dependabot/npm_and_yarn/firebase-7.17.2

Browse Source
This commit is contained in:
Liyas Thomas
2020-08-07 07:32:07 +05:30
committed by GitHub
parent a20da8036f 47c800b78b
commit 4acb2a5d92
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en-US.json
View File

@@ -260,6 +260,8 @@
"empty": "Empty", "empty": "Empty",
"extensions": "Extensions", "extensions": "Extensions",
"extensions_use_toggle": "Use the browser extension to send requests (if present)", "extensions_use_toggle": "Use the browser extension to send requests (if present)",
"extension_version": "Extension Version",
"extension_ver_not_reported": "Not Reported",
"extensions_info1": "Browser extension that simplifies access to Postwoman", "extensions_info1": "Browser extension that simplifies access to Postwoman",
"extensions_info2": "Get Postwoman browser extension!", "extensions_info2": "Get Postwoman browser extension!",
"installed": "Installed", "installed": "Installed",

12
pages/settings.vue
View File

@@ -129,6 +129,13 @@
</div> </div>
</li> </li>
</ul> </ul>
<ul class="info">
<li v-if="extensionVersion != null">
{{ $t("extension_version") }}: v{{ extensionVersion.major }}.{{ extensionVersion.minor }}
</li>
<li v-else>{{ $t("extension_version") }}: {{ $t("extension_ver_not_reported") }}</li>
</ul>
</pw-section> </pw-section>
<pw-section class="blue" :label="$t('proxy')" ref="proxy"> <pw-section class="blue" :label="$t('proxy')" ref="proxy">
@@ -210,6 +217,7 @@
<script> <script>
import firebase from "firebase/app" import firebase from "firebase/app"
import { fb } from "~/helpers/fb" import { fb } from "~/helpers/fb"
import { hasExtensionInstalled } from "../helpers/strategies/ExtensionStrategy"
export default { export default {
components: { components: {
@@ -299,6 +307,10 @@ export default {
}, },
], ],
extensionVersion: hasExtensionInstalled()
? window.__POSTWOMAN_EXTENSION_HOOK__.getVersion()
: null,
settings: { settings: {
SCROLL_INTO_ENABLED: SCROLL_INTO_ENABLED:
typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !== "undefined" typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !== "undefined"