Merge pull request #543 from liyasthomas/refactor

Refactor
hoppscotch · Feb 1, 2020 · 4c62baa · 4c62baa
2 parents f9008df + 0f55b8e
commit 4c62baa
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 158 deletions.
diff --git a/components/ace-editor.vue b/components/ace-editor.vue
@@ -55,8 +55,8 @@ export default {
 
   mounted() {
     const editor = ace.edit(this.$refs.editor, {
-      theme: "ace/theme/" + this.defineTheme(),
-      mode: "ace/mode/" + this.lang,
+      theme: `ace/theme/${this.defineTheme()}`,
+      mode: `ace/mode/${this.lang}`,
       ...this.options
     });
 
@@ -76,11 +76,10 @@ export default {
     defineTheme() {
       if (this.theme) {
         return this.theme;
-      } else {
-        return (
-          this.$store.state.postwoman.settings.THEME_ACE_EDITOR || DEFAULT_THEME
-        );
       }
+      return (
+        this.$store.state.postwoman.settings.THEME_ACE_EDITOR || DEFAULT_THEME
+      );
     }
   },
 

diff --git a/pages/doc.vue b/pages/doc.vue
@@ -363,8 +363,8 @@ export default {
       let file = this.$refs.collectionUpload.files[0];
       if (file !== undefined && file !== null) {
         let reader = new FileReader();
-        reader.onload = e => {
-          this.collectionJSON = e.target.result;
+        reader.onload = ({ target }) => {
+          this.collectionJSON = target.result;
         };
         reader.readAsText(file);
         this.$toast.info(this.$t("file_imported"), {

diff --git a/pages/graphql.vue b/pages/graphql.vue
@@ -531,7 +531,10 @@ export default {
         return this.$store.state.gql.variablesJSONString;
       },
       set(value) {
-        this.$store.commit("setGQLState", { value, attribute: "variablesJSONString" });
+        this.$store.commit("setGQLState", {
+          value,
+          attribute: "variablesJSONString"
+        });
       }
     },
     headerString() {
@@ -620,7 +623,7 @@ export default {
         this.headers.forEach(header => {
           headers[header.key] = header.value;
         });
-        
+
         let variables = JSON.parse(this.variableString);
 
         const gqlQueryString = this.gqlQueryString;
@@ -780,13 +783,10 @@ export default {
     downloadResponse() {
       const dataToWrite = JSON.stringify(this.schemaString, null, 2);
       const file = new Blob([dataToWrite], { type: "application/json" });
-      const a = document.createElement("a"),
-        url = URL.createObjectURL(file);
+      const a = document.createElement("a");
+      const url = URL.createObjectURL(file);
       a.href = url;
-      a.download = (this.url + " on " + Date() + ".graphql").replace(
-        /\./g,
-        "[dot]"
-      );
+      a.download = `${this.url} on ${Date()}.graphql`.replace(/\./g, "[dot]");
       document.body.appendChild(a);
       a.click();
       this.$refs.downloadResponse.innerHTML = this.doneButton;