From 96e8496a6e85ea89f85a07d2718bfecdd4d1947d Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Mon, 20 Jul 2015 22:28:23 +0200
Subject: [PATCH] Loading flashing when not needed

---
 couchpotato/core/media/movie/_base/static/list.js  | 4 +++-
 couchpotato/static/scripts/combined.plugins.min.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/couchpotato/core/media/movie/_base/static/list.js b/couchpotato/core/media/movie/_base/static/list.js
index eab834a..2644304 100644
--- a/couchpotato/core/media/movie/_base/static/list.js
+++ b/couchpotato/core/media/movie/_base/static/list.js
@@ -566,6 +566,7 @@ var MovieList = new Class({
 			self.load_more.set('text', 'loading...');
 		}
 
+		var loader_timeout;
 		if(self.movies.length === 0 && self.options.loader){
 
 			self.loader_first = new Element('div.mask.loading.with_message').adopt(
@@ -574,7 +575,7 @@ var MovieList = new Class({
 			createSpinner(self.loader_first);
 
 			var lfc = self.loader_first;
-			setTimeout(function(){
+			loader_timeout = setTimeout(function(){
 				lfc.addClass('show');
 			}, 10);
 
@@ -593,6 +594,7 @@ var MovieList = new Class({
 				if(reset)
 					self.movie_list.empty();
 
+				if(loader_timeout) clearTimeout(loader_timeout);
 				if(self.loader_first){
 					var lf = self.loader_first;
 					self.loader_first = null;
diff --git a/couchpotato/static/scripts/combined.plugins.min.js b/couchpotato/static/scripts/combined.plugins.min.js
index 2622954..1b4fa07 100644
--- a/couchpotato/static/scripts/combined.plugins.min.js
+++ b/couchpotato/static/scripts/combined.plugins.min.js
@@ -827,13 +827,14 @@ var MovieList = new Class({
             self.scrollspy.stop();
             self.load_more.set("text", "loading...");
         }
+        var loader_timeout;
         if (self.movies.length === 0 && self.options.loader) {
             self.loader_first = new Element("div.mask.loading.with_message").adopt(new Element("div.message", {
                 text: self.options.title ? "Loading '" + self.options.title + "'" : "Loading..."
             })).inject(self.el, "top");
             createSpinner(self.loader_first);
             var lfc = self.loader_first;
-            setTimeout(function() {
+            loader_timeout = setTimeout(function() {
                 lfc.addClass("show");
             }, 10);
             self.el.setStyle("min-height", 220);
@@ -846,6 +847,7 @@ var MovieList = new Class({
             }, self.filter),
             onSuccess: function(json) {
                 if (reset) self.movie_list.empty();
+                if (loader_timeout) clearTimeout(loader_timeout);
                 if (self.loader_first) {
                     var lf = self.loader_first;
                     self.loader_first = null;