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

This commit is contained in:
Liyas Thomas
2020-08-07 07:32:07 +05:30
committed by GitHub
2 changed files with 14 additions and 0 deletions

View File

@@ -260,6 +260,8 @@
"empty": "Empty",
"extensions": "Extensions",
"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_info2": "Get Postwoman browser extension!",
"installed": "Installed",

View File

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