Resolved merge

1 files changed, 5 insertions, 29 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index da68baa..c92cb62 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -436,8 +436,6 @@ function initChat() {
 
     messageList = $("#messageList")[0]
 
-    if (!isEmptyObject(RawFavs)) paletteButtonShow()
-
     initChatThumb()
 
     scrollToEnd()
@@ -512,9 +510,6 @@ function initProfile() {
         t.html(buildMsgContent(t.text()));
     });
     initLogThumb()
-    if (window.location.href == 'http://dump.fm/scottbot') {
-        $('body').append($('<embed src="/static/tunes/busters.mid" autostart="true" hidden="true">'));
-    }
 };
 
 function initLog() {
@@ -578,29 +573,6 @@ function initChatThumb(){
   })
 }
 
-function paletteButtonHideAnim(){
-  $("#msginputrapper").stop().animate({"marginRight": "374px"}, 'fast')
-  $("#msgSubmit").stop().animate({"right": "260px"}, 'fast')
-  $("#palette-button").stop().animate({"width": "0px"}, 'fast', 'swing', function(){ $("#palette-button").css("display", "none") })
-}
-function paletteButtonHide(){
-  $("#msginputrapper").css("marginRight", "374px")
-  $("#msgSubmit").css("right", "260px")
-  $("#palette-button").css("width", "0px")
-  $("#palette-button").css("display", "none")
-}
-function paletteButtonShowAnim(){
-  $("#msginputrapper").stop().animate({"marginRight": "415px"}, 'fast')
-  $("#msgSubmit").stop().animate({"right": "300px"}, 'fast')
-  $("#palette-button").css("display", "inline-block")
-  $("#palette-button").stop().animate({"width": "40px"}, 'fast')
-}
-function paletteButtonShow(){
-  $("#msginputrapper").css("marginRight", "415px")
-  $("#msgSubmit").css("right", "300px")
-  $("#palette-button").css("display", "inline-block")
-  $("#palette-button").css("width", "40px")
-}
 
 function paletteToChat(img){
   var chatText = $("#msgInput").val()
@@ -639,7 +611,11 @@ function paletteBuildImageThumbs(){
 
 function paletteShow(){
   $("#palette").css("display", "block")
-  paletteBuildImageThumbs()
+  if (isEmptyObject(RawFavs)) {
+    $('#palette-thumbs').html('<h1 style="width:300px;color:#000;letter-spacing:-1px;">This is where all the stuff you FAV goes!<br><br>To FAV a post click the little heart <img src="/static/img/thumbs/smallheart.gif"> next to a users name.<br><br> Everything you fav gets saved to your profile.. Have fun!</h1>');
+  } else {
+    paletteBuildImageThumbs();
+  }
 }
 function paletteHide(){
   $("#palette").css("display", "none")