fixed some bugs on chat slideout / content push-pull

app/client/scripts/events.js

@@ -1360,9 +1360,6 @@ Template.room.events({
     "click #global-chat-tab": function () {
         $("#global-chat-tab").removeClass("unread-messages");
     },
-    "click .header-collapse": function(){
-        console.log("Hello");
-    },
     "click #sync": function () {
         if (Session.get("currentSong") !== undefined) {
             var room = Rooms.findOne({type: Session.get("type")});

app/client/scripts/onCreated.js

@@ -342,7 +342,8 @@ Template.room.onCreated(function () {
         }
     });
     Meteor.setTimeout(function(){
-        $("#chat-slideout").on("click", function(){
+        $("#chat-slideout").on("click", function(e){
+            $("#chat-slideout").attr("disabled", true);
             var marginRightWidth = ($(document).width() - $(".container").width()) / 2 + "px";
             $(".chat-ul").scrollTop(1000000);
             $(".container").css("margin-right", "370px")
@@ -352,9 +353,16 @@ Template.room.onCreated(function () {
         });
         $("body").on("click", function(){
             var marginRightWidth = ($(document).width() - $(".container").width()) / 2 + "px";
-            if($("#slide-out").css("right") === "0px"){
-                $(".container").css("margin-right", marginRightWidth);
-            }
+            var interval = Meteor.setInterval(function(){
+                if($("#slide-out").css("right") < "0px"){
+                    $(".container").css("margin-right", marginRightWidth);
+                    Meteor.clearInterval(interval);
+                }
+            }, 10);
+        });
+        $(window).on("resize", function(){
+            var marginRightWidth = ($(document).width() - $(".container").width()) / 2 + "px";
+            $(".container").css("margin-right", marginRightWidth);
         })
     }, 1000);
 });

app/client/templates/room.html

@@ -7,11 +7,8 @@
                         <li><a href="/"><i class="material-icons">home</i></a></li>
                         <li><a href="#add_song_modal" id="add-song-modal-button"><i
                                 class="material-icons">playlist_add</i></a></li>
-                        <li><a href="#bug_report_modal"><i class="material-icons">flag</i></a></li>
-                        <li><a href="#"><i class="material-icons left">skip_next</i>{{votes}}</a></li>
-                        {{#if isAdmin}}
-                          <li><a href="#"><i class="material-icons">shuffle</i></a></li>
-                        {{/if}}
+                        <li><a href="#bug_report_modal"><i class="material-icons">bug_report</i></a></li>
+                        <li><a href="#" id="vote-skip"><i class="material-icons">skip_next</i> <span class="new badge">{{votes}}</span></a></li>
                     </ul>
                     <span class="brand-logo center">{{type}}</span>
                     <ul class="right hide-on-med-and-down">