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

Merge branch 'master' into feature/post-request-tests

Browse Source
This commit is contained in:
Nick Palenchar
2020-01-25 10:16:01 -05:00
committed by GitHub
parent 3e27157eaa 16491d36de
commit 9e615c91cb
18 changed files with 230 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/graphql.vue
View File

@@ -812,9 +812,7 @@ export default {
}
}
this.gqlTypes = types;
this.$refs.queryEditor.setValidationSchema(schema);
this.$nuxt.$loading.finish();
const duration = Date.now() - startTime;
this.$toast.info(this.$t("finished_in", { duration }), {

16
pages/settings.vue
View File

@@ -39,7 +39,7 @@
</pw-toggle>
</p>
<p v-if="fb.currentSettings.length == 0">
<button class="" @click="writeSettings">
<button class="" @click="initSettings">
<i class="material-icons">sync</i>
<span>{{ $t("turn_on") + " " + $t("sync") }}</span>
</button>
@@ -406,8 +406,8 @@ export default {
action: {
text: this.$t("yes"),
onClick: (e, toastObject) => {
fb.writeSettings("syncHistory", false);
fb.writeSettings("syncCollections", true);
fb.writeSettings("syncHistory", true);
fb.writeSettings("syncCollections", false);
this.$router.push({ path: "/settings" });
toastObject.remove();
}
@@ -435,8 +435,8 @@ export default {
action: {
text: this.$t("yes"),
onClick: (e, toastObject) => {
fb.writeSettings("syncHistory", false);
fb.writeSettings("syncCollections", true);
fb.writeSettings("syncHistory", true);
fb.writeSettings("syncCollections", false);
this.$router.push({ path: "/settings" });
toastObject.remove();
}
@@ -453,9 +453,9 @@ export default {
toggleSettings(s, v) {
fb.writeSettings(s, !v);
},
writeSettings() {
fb.writeSettings("syncHistory", false);
fb.writeSettings("syncCollections", true);
initSettings() {
fb.writeSettings("syncHistory", true);
fb.writeSettings("syncCollections", false);
}
},