Merge pull request #8 from wells/v1.1.4-dev

v1.1.4 dev
wells · Dec 27, 2016 · 67a644d · 67a644d
2 parents 071b9cc + 3b4a016
commit 67a644d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 34 deletions.
diff --git a/public/build/js/app-3a65e013a6.js → public/build/js/app-dcee74d813.js b/public/build/js/app-3a65e013a6.js → public/build/js/app-dcee74d813.js
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
   "css/app.css": "css/app-c6da92f35b.css",
-  "js/app.js": "js/app-3a65e013a6.js"
+  "js/app.js": "js/app-dcee74d813.js"
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/assets/js/components/Movies.vue b/resources/assets/js/components/Movies.vue
@@ -76,17 +76,15 @@ export default {
   },
 
   created: function () {
-    this.loadingRoute()
+    if(this.movies.length == 0) {
+      this.loadingRoute()
+    }
+
     this.clearGenresFilter()
     this.fetchData()
   },
 
   watch: {
-    '$route': function () {
-      this.loadingRoute()
-      this.fetchData()
-    },
-
     'links': function () {
       let self = this
 

diff --git a/resources/assets/js/components/Settings.vue b/resources/assets/js/components/Settings.vue
@@ -74,15 +74,11 @@ export default {
   },
 
   created: function () {
-    this.loadingRoute()
-    this.fetchData()
-  },
-
-  watch: {
-    '$route': function () {
+    if(!this.settings) {
       this.loadingRoute()
-      this.fetchData()
     }
+
+    this.fetchData()
   },
 
   methods: {

diff --git a/resources/assets/js/components/Shows.vue b/resources/assets/js/components/Shows.vue
@@ -76,17 +76,15 @@ export default {
   },
 
   created: function () {
-    this.loadingRoute()
+    if(this.shows.length == 0) {
+      this.loadingRoute()
+    }
+
     this.clearGenresFilter()
     this.fetchData()
   },
 
   watch: {
-    '$route': function () {
-      this.loadingRoute()
-      this.fetchData()
-    },
-
     'links': function () {
       let self = this