From 649124f8e4e77ba8039833fd15a21270497810c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Sat, 20 Jun 2015 16:42:23 +0200
Subject: [PATCH] Fixed bug with transition on adding a song

---
 .htaccess         | 4 ++--
 server/server.js  | 2 +-
 static/js/list.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.htaccess b/.htaccess
index 105d8c48..fbb84555 100755
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
 #Comment out the two folling lines when running server locally to fix issues with localhost
-RewriteCond %{HTTPS} !=on
-RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+#RewriteCond %{HTTPS} !=on
+#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 
 RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]
diff --git a/server/server.js b/server/server.js
index ea6cd7f8..4b071678 100755
--- a/server/server.js
+++ b/server/server.js
@@ -4,7 +4,7 @@ var server;
 This if for the localhost running
 
 ******/
-localhost = false;
+localhost = true;
 
 //https server
 if(localhost)
diff --git a/static/js/list.js b/static/js/list.js
index 1fd17bec..5f962d1c 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -46,7 +46,7 @@ function channel_function(msg)
 
 		setTimeout(function(){
 			var test = $("#wrapper").children()[getIndexOfSong(msg[1].id)];
-			test.style.height = 66;
+			$(test).css("height", 66);
 		},0);
 
 	}else if(msg[0] == "deleted")