From 990c2cb2684fa37a0a9b36fd106014276629c3e0 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 30 Mar 2016 14:23:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B0=20=D1=81=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

восстанавливается сезон, серия и время
---
 webapp/WEB-INF/player.html | 96 ++++++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/webapp/WEB-INF/player.html b/webapp/WEB-INF/player.html
index 10b9498..f985626 100644
--- a/webapp/WEB-INF/player.html
+++ b/webapp/WEB-INF/player.html
@@ -3,8 +3,8 @@
     <script type="text/javascript">
         var video_data = ${json};
         var player;
-        var videotime = 0;
         var origDocTitle;
+        var isSerial = false;
 
         function msToTime(ms) {
             function addZ(n) { return (n<10? '0':'') + n; }
@@ -29,6 +29,41 @@
             $('#title').show();
         }
 
+        function setSeason(idx) {
+            var season_title = video_data.playlist[idx].comment;
+            $('#dropdownSeason').html(season_title + '&nbsp;<span class="caret"></span>');
+            $('#dropdownSerial').html('Serials&nbsp;<span class="caret"></span>');
+
+            var serial_menu = $('#pl-serial-menu');
+            serial_menu.html('');
+            video_data.playlist[idx].playlist.forEach(function(item, i){
+                serial_menu.append('<li><a data-file="' + item.file + '" data-season="' + idx + '" href="#" onclick="setSerial('+ idx + ',' + i + ');return false;">' + item.comment + '</a></li>');
+            });
+
+            /*
+            serial_menu.find('a').bind('click', function(){
+                $('#dropdownSerial').html(this.text + '&nbsp;<span class="caret"></span>');
+                player.attr('src', '${basedir}'+this.attributes['data-file'].value);
+                player.attr('data-season', this.attributes['data-season'].value);
+                player.attr('data-serial', this.attributes['data-serial'].value);
+                setTitle(this.text);
+            });
+            */
+
+            $('#pl-serial').removeClass('hide');
+        }
+
+        function setSerial(idx, sidx) {
+            var serial_title = video_data.playlist[idx].playlist[sidx].comment;
+            $('#dropdownSerial').html(serial_title + '&nbsp;<span class="caret"></span>');
+
+            var serial_file = video_data.playlist[idx].playlist[sidx].file;
+            player.attr('src', '${basedir}' + serial_file);
+            player.attr('data-season', idx);
+            player.attr('data-serial', sidx);
+            setTitle(serial_title);
+        }
+
         $(function(){
             player = $('#player');
             origDocTitle = document.title;
@@ -43,48 +78,32 @@
                 player.attr('src', '${basedir}'+video_data.file);
                 $('#plbr').hide();
             } else if (typeof(video_data.playlist) !== 'undefined') {
+                isSerial = true;
                 $('#pl-season').removeClass('hide');
                 menu = $('#pl-season-menu');
 
                 menu.html('');
                 video_data.playlist.forEach(function(item, i){
-                    menu.append('<li><a data-tag="' + i + '" href="#" onclick="return false;">' + item.comment + '</a></li>');
-                });
-
-                ddBtn = $('#dropdownSeason');
-                smenu = $('#pl-serial-menu');
-                menu.find('a').bind('click', function(){
-                    ddBtn.html(this.text + '&nbsp;<span class="caret"></span>');
-
-                    $('#dropdownSerial').html('Serials&nbsp;<span class="caret"></span>');
-
-                    smenu.html('');
-                    video_data.playlist[this.attributes['data-tag'].value].playlist.forEach(function(item){
-                        smenu.append('<li><a data-file="' + item.file + '" href="#" onclick="return false;">' + item.comment + '</a></li>');
-                    });
-
-                    smenu.find('a').bind('click', function(){
-                        $('#dropdownSerial').html(this.text + '&nbsp;<span class="caret"></span>');
-                        player.attr('src', '${basedir}'+this.attributes['data-file'].value);
-                        setTitle(this.text);
-                    });
-
-                    $('#pl-serial').removeClass('hide');
+                    menu.append('<li><a data-tag="' + i + '" href="#" onclick="setSeason(' + i + ');return false;">' + item.comment + '</a></li>');
                 });
             }
 
-            // save video time
+            // load video time
             var path = window.location.pathname.substr("${basedir}".length);
-            var data = Cookies.getJSON(path);
+            data = Cookies.getJSON(path);
             if (data != null) {
-                videotime = data.time;
-                var fulltime = msToTime(videotime * 1000);
+                var fulltime = msToTime(data.time * 1000);
                 $('#mdl-vtime').text(fulltime.h + ':' + fulltime.m + ':' + fulltime.s);
+                if (isSerial) {
+                    $('#mdl-season').text(data.season + 1);
+                    $('#mdl-serial').text(data.serial + 1);
+                }
                 $('#modal').modal('show');
             } else {
                 player.load();
             }
 
+            // save video time
             var tl;
             player.bind('play', function(){
                 tl = $.now();
@@ -94,14 +113,24 @@
                 var sec = Math.floor((tc-tl)/1000);
                 if (sec >= 5) {
                     if (Math.floor(player[0].currentTime) <= 10) return;
-                    Cookies.set(path, {time:player[0].currentTime});
+                    save_data = {time:player[0].currentTime};
+                    if (isSerial) {
+                        save_data.season = parseInt(player.attr('data-season'), 10);
+                        save_data.serial = parseInt(player.attr('data-serial'), 10);
+                    }
+                    Cookies.set(path, save_data);
                     tl = tc;
+                    console.debug(save_data);
                 }
             });
         });
 
         function continueVideo() {
-            player[0].currentTime = videotime;
+            if (isSerial) {
+                setSeason(data.season);
+                setSerial(data.season, data.serial);
+            }
+            player[0].currentTime = data.time;
             player[0].load();
         }
     </script>
@@ -109,8 +138,15 @@
     <div class="modal fade" tabindex="-1" role="dialog" id="modal">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">Продолжить просмотр?</h4>
+                </div>
                 <div class="modal-body">
-                    <p class="text-center">Продолжить просмотр с <span id="mdl-vtime"></span>?</p>
+                        <b>Время:</b> <span id="mdl-vtime"></span>
+                        <div id="mdl-blk-serial">
+                            <b>Сезон:</b> <span id="mdl-season"></span><br>
+                            <b>Серия:</b> <span id="mdl-serial"></span>
+                        </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="continueVideo()">Да</button>