Removed token.min.js from github, fixed issue with embedded player playing even when not supposed to, and fixed faulty error-message when applying to get a token

server/public/assets/js/embed.js

@@ -3,6 +3,7 @@ var timed_remove_check;
 var gotten_np = false;
 var song_title = "";
 var paused = false;
+var startTime = 0;
 var player_ready = false;
 var list_html = $("#list-song-html").html();
 var w_p		= true;
@@ -69,6 +70,7 @@ $(document).ready(function() {
         autoplay = true;
     } else {
         paused = true;
+        
     }
 
     if(hash.indexOf("videoonly") > -1) {

server/public/assets/js/player.js

@@ -12,6 +12,42 @@ var Player = {
         Helper.log(["object", obj]);
         var state;
         fix_too_far = false;
+        if(embed && !autoplay && obj && obj.np.length > 0) {
+            if(Object.keys(obj).length == 0) {
+                paused = false;
+                empty_clear = true;
+            } else {
+                empty_clear = false;
+            }
+            Player.getTitle(obj.np[0].title, viewers);
+            //Player.setBGimage(video_id);
+            if(!Helper.mobilecheck()) {
+                Player.notifyUser(obj.np[0].id, obj.np[0].title);
+            }
+            video_id   = obj.np[0].id;
+            Player.np = {
+                id: video_id,
+                start: obj.np[0].start,
+                end: obj.np[0].end,
+                duration: obj.np[0].duration,
+            };
+            if(!obj.np[0].hasOwnProperty("start")) {
+                Player.np.start = 0;
+            }
+            if(!obj.np[0].hasOwnProperty("end")) {
+                Player.np.end = Player.np.duration;
+            }
+
+            conf       = obj.conf[0];
+            time       = obj.time;
+            seekTo     = (time - conf.startTime) + Player.np.start;
+            startTime = time - conf.startTime;
+            song_title = obj.np[0].title;
+            duration   = obj.np[0].duration;
+            Player.loadVideoById(video_id, duration);
+            Player.stopVideo();
+            return;
+        }
         if(embed && obj.np) {
             if(window.parentWindow && window.parentOrigin) {
                 window.parentWindow.postMessage({type: "np", title: obj.np[0].title}, window.parentOrigin);
@@ -64,7 +100,6 @@ var Player = {
                 }
                 //List.importOldList(channel.toLowerCase());
             } else if(paused){
-
                 Player.getTitle(obj.np[0].title, viewers);
                 //Player.setBGimage(video_id);
                 if(!Helper.mobilecheck()) {
@@ -162,7 +197,7 @@ var Player = {
                                 }
                             }
                             if(!paused){
-                                if((!mobile_beginning || chromecastAvailable) && prev_state != 2) {
+                                if(((!mobile_beginning || chromecastAvailable) && prev_state != 2) && autoplay) {
                                     Player.playVideo();
                                 }
                                 if(!durationBegun) {
@@ -189,6 +224,9 @@ var Player = {
                         }
                     }
                 } else {
+                    if(!autoplay) {
+                        Player.stopVideo();
+                    }
                     Player.getTitle(song_title, viewers);
                 }
             }
@@ -213,7 +251,7 @@ var Player = {
             "New state\nState: ",
             newState
         ]);
-        if(player.getCurrentTime() > startTime + Player.np.start && !fix_too_far && autoplay)  {
+        if(Player.player && Player.player.getCurrentTime() > startTime + Player.np.start && !fix_too_far && autoplay)  {
             Player.seekTo(seekTo);
             Player.playVideo();
             fix_too_far = true;
@@ -237,6 +275,7 @@ var Player = {
                 }
                 break;
             case YT.PlayerState.PLAYING:
+                if(embed && !autoplay) autoplay = true;
                 if(!window.MSStream) {
                     $("#player").css("opacity", "1");
                     if(!Helper.mobilecheck()) {
@@ -350,7 +389,7 @@ var Player = {
             chrome.cast.media.GenericMediaMetadata({metadataType: 0, title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg', images: ['https://img.youtube.com/vi/'+id+'/mqdefault.jpg']});
             chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
         } else {
-            window.player = Player.player;
+            //window.player = Player.player;
             Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
         }
         if(offline) {

server/public/assets/js/token_apply.js

@@ -23,13 +23,12 @@ $(document).ready(function() {
             },
             success: function(response) {
                 $(".full-form-token").addClass("hide");
-                if(response != "OK") {
+                if(response == "success") {
+                    Materialize.toast("Email sent!", 3000, "green lighten");
+                } else {
                     $("#email_address").attr("readonly", true);
                     $(".submit").toggleClass("disabled");
-                    Materialize.toast("Couldn't send email.", 3000, "red lighten");
-                } else {
-                    Materialize.toast("Email sent!", 3000, "green lighten");
-                    grecaptcha.reset();
+                    Materialize.toast("Something went wrong. Sure that email hasn't been used for another token?", 3000, "red lighten");
                 }
             },
             error: function(response) {