Przeglądaj źródła

vote-to-skip feature now working

Akira Laine 9 lat temu
rodzic
commit
353871fb81

+ 2 - 2
app/client/scripts/events.js

@@ -1420,8 +1420,8 @@ Template.room.events({
         Meteor.call("dislikeSong", Session.get("currentSong").mid);
         Meteor.call("dislikeSong", Session.get("currentSong").mid);
     },
     },
     "click #vote-skip": function () {
     "click #vote-skip": function () {
-        Meteor.call("voteSkip", type, function (err, res) {
-            $("#vote-skip").attr("disabled", true);
+        Meteor.call("voteSkip", Session.get("type"), function (err, res) {
+            $("#vote-skip").addClass("disabled");
         });
         });
     },
     },
     "click #report-prev": function (e) {
     "click #report-prev": function (e) {

+ 1 - 0
app/client/scripts/helpers.js

@@ -427,6 +427,7 @@ Template.room.helpers({
         }
         }
     },
     },
     votes: function () {
     votes: function () {
+        console.log(Rooms.findOne({type: Session.get("type")}).votes);
         return Rooms.findOne({type: Session.get("type")}).votes;
         return Rooms.findOne({type: Session.get("type")}).votes;
     }
     }
 });
 });

+ 1 - 0
app/client/scripts/onCreated.js

@@ -278,6 +278,7 @@ Template.room.onCreated(function () {
                             currentSong.skipDuration = 0;
                             currentSong.skipDuration = 0;
                         }
                         }
                         YTPlayer.seekTo(Number(currentSong.skipDuration) + getTimeElapsed() / 1000);
                         YTPlayer.seekTo(Number(currentSong.skipDuration) + getTimeElapsed() / 1000);
+                        $("#vote-skip").removeClass("disabled");
                     }
                     }
                     Session.set("pauseVideo", false);
                     Session.set("pauseVideo", false);
                     getSongInfo(currentSong);
                     getSongInfo(currentSong);

+ 8 - 0
app/client/stylesheets/app.css

@@ -42,6 +42,14 @@ hr{
     margin: 0;
     margin: 0;
 }
 }
 
 
+.disabled{
+    cursor: default;
+}
+
+.disabled:hover{
+    background-color: inherit;
+}
+
 .container{
 .container{
     transition: all 0.1s;
     transition: all 0.1s;
 }
 }

+ 1 - 1
app/client/templates/room.html

@@ -7,7 +7,7 @@
                         <li><a href="/"><i class="material-icons">home</i></a></li>
                         <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="#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="#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>
+                        <li><a id="vote-skip"><i class="material-icons left">skip_next</i>{{votes}}</a></li>
                         {{#if isAdmin}}
                         {{#if isAdmin}}
                             <li><a class='dropdown-button' data-activates='admin-dropdown'><i class="material-icons">control_point</i></a></li>
                             <li><a class='dropdown-button' data-activates='admin-dropdown'><i class="material-icons">control_point</i></a></li>
                         {{/if}}
                         {{/if}}