Merge branch 'master' of github.com:SimulatedGREG/electron-vue into hotfix/clean-up-tests

SimulatedGREG · SimulatedGREG · commit 6a96594fbcaf · 2016-12-05T16:02:56.000-06:00
diff --git a/template/app/src/components/LandingPageView/CurrentPage.vue b/template/app/src/components/LandingPageView/CurrentPage.vue
@@ -20,14 +20,14 @@
 
 <script>
   export default {
-    created () {
+    created{{#if_eq eslintConfig 'standard'}} {{/if_eq}}() {
       // Set $route values that are not preset during unit testing
       if (process.env.NODE_ENV === 'testing') {
         this.$route = {
           name: 'landing-page',
-          path: '/landing-page'
-        }
+          path: '/landing-page'{{#if_eq eslintConfig 'airbnb'}},{{/if_eq}}
+        }{{#if_eq eslintConfig 'airbnb'}};{{/if_eq}}
       }
-    }
-  }
+    }{{#if_eq eslintConfig 'airbnb'}},{{/if_eq}}
+  }{{#if_eq eslintConfig 'airbnb'}};{{/if_eq}}
 </script>
