From 1f9cf46b1c57c05eea98ff2adfc116bdfc9d21de Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Tue, 12 Dec 2017 14:35:30 +0300
Subject: [PATCH 01/10] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B1=D1=80=D0=BE=D1=81=D0=BA=D0=B8=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=8A=D0=B5=D0=BA=D1=82=D0=B0-=D0=BF=D0=BB=D0=B5=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/kinosearch/webapp/player.ftl    | 32 ++-----------
 .../kinosearch/webapp/static/js/ksplayer.js   | 47 +++++++++++++++++++
 2 files changed, 50 insertions(+), 29 deletions(-)
 create mode 100644 src/main/resources/kinosearch/webapp/static/js/ksplayer.js

diff --git a/src/main/resources/kinosearch/webapp/player.ftl b/src/main/resources/kinosearch/webapp/player.ftl
index 59d015d..a185878 100644
--- a/src/main/resources/kinosearch/webapp/player.ftl
+++ b/src/main/resources/kinosearch/webapp/player.ftl
@@ -1,7 +1,7 @@
 [#ftl]
 [#include "/header.inc.ftl"]
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/js-cookie/2.1.0/js.cookie.min.js"></script>
-<script type="text/javascript" src="/js/player.js"></script>
+<script type="text/javascript" src="/js/ksplayer.js"></script>
 
 <div class="modal fade" tabindex="-1" role="dialog" id="modal">
     <div class="modal-dialog modal-sm">
@@ -26,35 +26,9 @@
 
 <hr>
 
-<div id="pl-season" class="dropdown hide" style="display: inline-block;">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownSeason" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-        Seasons
-        <span class="caret"></span>
-    </button>
-    <ul id="pl-season-menu" class="dropdown-menu" aria-labelledby="dropdownSeason">
-        <li><a href="#">Season</a></li>
-    </ul>
-</div>
-
-<div id="pl-serial" class="dropdown hide" style="display: inline-block;">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownSerial" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-        Serials
-        <span class="caret"></span>
-    </button>
-    <ul id="pl-serial-menu" class="dropdown-menu" aria-labelledby="dropdownSerial">
-        <li><a href="#">Serial</a></li>
-    </ul>
-</div>
-
-<br id="plbr">
-
-<h2 id="title"></h2>
-
-<br>
-
-<video id="player" class="center-block" controls="controls" preload="none"></video>
+<div id="ksplayer"></div>
 <br>
 <script type="text/javascript"> 
-    const playerCore = initPlayer(${json}); 
+    const ksplayer = new KSPlayer('ksplayer');
 </script>
 [#include "/fother.inc.ftl"]
\ No newline at end of file
diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
new file mode 100644
index 0000000..fa062d3
--- /dev/null
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -0,0 +1,47 @@
+const KSPlayer = function(containerId) {
+    /* --- FIELDS -------------- */
+
+    var videoType = 'unknown';
+    var isShowTitle = false;
+
+    /* --- PRIVATE FUNCTIONS --- */
+
+    /* --- CONSTRUCTOR --------- */
+
+    const containerElement = document.getElementById(containerId);
+    if (containerElement === null) {
+        throw `Container "${containerId}" not found!`;
+    }
+
+    let videoElement = document.createElement('video');
+    videoElement.id = 'player';
+    videoElement.className = 'center-block';
+    videoElement.setAttribute('controls', 'controls');
+    videoElement.setAttribute('preload', 'none');
+
+    var titleElement = document.createElement('h2');
+    titleElement.id = 'title';
+
+    containerElement.appendChild(videoElement);
+
+    /* --- FUNCTIONS ----------- */
+
+    this.getType = function() {
+        return videoType;
+    }
+
+    this.setTitle = function(text) {
+        if (text) {
+            titleElement.innerText = text;
+            if (!isShowTitle) {
+                containerElement.insertBefore(titleElement, videoElement);
+                isShowTitle = true;
+            }
+        } else {
+            if (isShowTitle) {
+                containerElement.removeChild(titleElement);
+                isShowTitle = false;
+            }
+        }
+    }
+}

From 9b6bd13c36461d41fd13177b6adac9a1097be894 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Tue, 12 Dec 2017 17:52:02 +0300
Subject: [PATCH 02/10] =?UTF-8?q?KSPlayer:=20=D0=B1=D0=BE=D0=BB=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BA=D0=B8=20=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/webapp/static/js/ksplayer.js   | 93 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index fa062d3..0cc0b3a 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -1,11 +1,91 @@
 const KSPlayer = function(containerId) {
     /* --- FIELDS -------------- */
 
-    var videoType = 'unknown';
-    var isShowTitle = false;
+    let videoType = 'unknown';
+    let isShowTitle = false;
 
     /* --- PRIVATE FUNCTIONS --- */
 
+    function createSerialMenuElement() {
+        let div = document.createElement('div');
+        div.id = 'pl-serial';
+        div.className = 'dropdown';
+        div.style = 'display: inline-block';
+
+        let button = document.createElement('button');
+        button.className = 'btn btn-default dropdown-toggle';
+        button.type = 'button';
+        button.id = 'dropdownSerial';
+        button.setAttribute('data-toggle', 'dropdown');
+        button.setAttribute('aria-haspopup', 'true');
+        button.setAttribute('aria-expanded', 'true');
+
+        let text = document.createTextNode('Serials');
+
+        let span = document.createElement('span');
+        span.className = 'caret';
+        span.style = 'margin-left: .5em';
+
+        let ul = document.createElement('ul');
+        ul.id = 'pl-serial-menu';
+        ul.className = 'dropdown-menu';
+        ul.setAttribute('aria-labelledby', 'dropdownSerial');
+
+        let li = document.createElement('li');
+        let a = document.createElement('a');
+        a.href = '#';
+        a.innerText = 'Serial';
+
+        li.appendChild(a);
+        ul.appendChild(li);
+        button.appendChild(text);
+        button.appendChild(span);
+        div.appendChild(button);
+        div.appendChild(ul);
+
+        return div;
+    }
+
+    function createSeasonMenuElement() {
+        let div = document.createElement('div');
+        div.id = 'pl-season';
+        div.className = 'dropdown';
+        div.style = 'display: inline-block';
+
+        let button = document.createElement('button');
+        button.className = 'btn btn-default dropdown-toggle';
+        button.type = 'button';
+        button.id = 'dropdownSeason';
+        button.setAttribute('data-toggle', 'dropdown');
+        button.setAttribute('aria-haspopup', 'true');
+        button.setAttribute('aria-expanded', 'true');
+
+        let text = document.createTextNode('Seasons');
+
+        let span = document.createElement('span');
+        span.className = 'caret';
+        span.style = 'margin-left: .5em';
+
+        let ul = document.createElement('ul');
+        ul.id = 'pl-season-menu';
+        ul.className = 'dropdown-menu';
+        ul.setAttribute('aria-labelledby', 'dropdownSeason');
+
+        let li = document.createElement('li');
+        let a = document.createElement('a');
+        a.href = '#';
+        a.innerText = 'Season';
+
+        li.appendChild(a);
+        ul.appendChild(li);
+        button.appendChild(text);
+        button.appendChild(span);
+        div.appendChild(button);
+        div.appendChild(ul);
+
+        return div;
+    }
+
     /* --- CONSTRUCTOR --------- */
 
     const containerElement = document.getElementById(containerId);
@@ -19,9 +99,16 @@ const KSPlayer = function(containerId) {
     videoElement.setAttribute('controls', 'controls');
     videoElement.setAttribute('preload', 'none');
 
-    var titleElement = document.createElement('h2');
+    let titleElement = document.createElement('h2');
     titleElement.id = 'title';
 
+    let seasonMenu = createSeasonMenuElement();
+    let serialMenu = createSerialMenuElement();
+
+    containerElement.appendChild(seasonMenu);
+    containerElement.appendChild(serialMenu);
+    containerElement.appendChild(document.createElement('br'));
+    containerElement.appendChild(document.createElement('br'));
     containerElement.appendChild(videoElement);
 
     /* --- FUNCTIONS ----------- */

From bbc891b83b7bac3068b42de93d8363103975e896 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 13 Dec 2017 21:45:30 +0300
Subject: [PATCH 03/10] =?UTF-8?q?KSPlayer:=20=D0=B7=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E?=
 =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/kinosearch/webapp/player.ftl    |  2 +-
 .../kinosearch/webapp/static/js/ksplayer.js   | 55 +++++++++++++------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/kinosearch/webapp/player.ftl b/src/main/resources/kinosearch/webapp/player.ftl
index a185878..4e34a61 100644
--- a/src/main/resources/kinosearch/webapp/player.ftl
+++ b/src/main/resources/kinosearch/webapp/player.ftl
@@ -29,6 +29,6 @@
 <div id="ksplayer"></div>
 <br>
 <script type="text/javascript"> 
-    const ksplayer = new KSPlayer('ksplayer');
+    const ksplayer = new KSPlayer('ksplayer', ${json});
 </script>
 [#include "/fother.inc.ftl"]
\ No newline at end of file
diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index 0cc0b3a..c504732 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -1,12 +1,15 @@
-const KSPlayer = function(containerId) {
+const KSPlayer = function(containerId, data) {
     /* --- FIELDS -------------- */
 
-    let videoType = 'unknown';
     let isShowTitle = false;
 
+    /* --- PRIVATE FIELDS ------ */
+
+    let titleElement;
+
     /* --- PRIVATE FUNCTIONS --- */
 
-    function createSerialMenuElement() {
+    function createSerialMenuElement(serials) {
         let div = document.createElement('div');
         div.id = 'pl-serial';
         div.className = 'dropdown';
@@ -31,13 +34,18 @@ const KSPlayer = function(containerId) {
         ul.className = 'dropdown-menu';
         ul.setAttribute('aria-labelledby', 'dropdownSerial');
 
-        let li = document.createElement('li');
-        let a = document.createElement('a');
-        a.href = '#';
-        a.innerText = 'Serial';
+        serials.forEach(item => {
+            let li = document.createElement('li');
+            let a = document.createElement('a');
+            a.href = '#';
+            a.innerText = item.title;
+            a.setAttribute('data-file', item.file);
+            a.onclick = function() { return false; }
+
+            li.appendChild(a);
+            ul.appendChild(li);
+        });
 
-        li.appendChild(a);
-        ul.appendChild(li);
         button.appendChild(text);
         button.appendChild(span);
         div.appendChild(button);
@@ -86,6 +94,11 @@ const KSPlayer = function(containerId) {
         return div;
     }
 
+    function initTitleElement() {
+        titleElement = document.createElement('h2');
+        titleElement.id = 'title';
+    }
+
     /* --- CONSTRUCTOR --------- */
 
     const containerElement = document.getElementById(containerId);
@@ -99,16 +112,20 @@ const KSPlayer = function(containerId) {
     videoElement.setAttribute('controls', 'controls');
     videoElement.setAttribute('preload', 'none');
 
-    let titleElement = document.createElement('h2');
-    titleElement.id = 'title';
+    if (data.hasOwnProperty('title')) {
+        this.setTitle(data.title);
+    }
 
-    let seasonMenu = createSeasonMenuElement();
-    let serialMenu = createSerialMenuElement();
+    if (data.type === 'simple_serial') {
+        let serialMenu = createSerialMenuElement(data.serials);
+        containerElement.appendChild(serialMenu);
+        containerElement.appendChild(document.createElement('br'));
+        containerElement.appendChild(document.createElement('br'));
+    }
+
+    // let seasonMenu = createSeasonMenuElement();
+    // containerElement.appendChild(seasonMenu);    
 
-    containerElement.appendChild(seasonMenu);
-    containerElement.appendChild(serialMenu);
-    containerElement.appendChild(document.createElement('br'));
-    containerElement.appendChild(document.createElement('br'));
     containerElement.appendChild(videoElement);
 
     /* --- FUNCTIONS ----------- */
@@ -119,13 +136,15 @@ const KSPlayer = function(containerId) {
 
     this.setTitle = function(text) {
         if (text) {
+            if (!titleElement) initTitleElement();
             titleElement.innerText = text;
+
             if (!isShowTitle) {
                 containerElement.insertBefore(titleElement, videoElement);
                 isShowTitle = true;
             }
         } else {
-            if (isShowTitle) {
+            if (isShowTitle && titleElement) {
                 containerElement.removeChild(titleElement);
                 isShowTitle = false;
             }

From 3fb1d8fb629692eb88721251458a779b734936df Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 13 Dec 2017 21:52:27 +0300
Subject: [PATCH 04/10] =?UTF-8?q?KSPlayer:=20=D0=B7=D0=B0=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E?=
 =?UTF-8?q?=20=D1=81=D0=B5=D0=B7=D0=BE=D0=BD=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/webapp/static/js/ksplayer.js   | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index c504732..0e369a1 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -6,6 +6,7 @@ const KSPlayer = function(containerId, data) {
     /* --- PRIVATE FIELDS ------ */
 
     let titleElement;
+    let seasonSerials = [];
 
     /* --- PRIVATE FUNCTIONS --- */
 
@@ -54,7 +55,7 @@ const KSPlayer = function(containerId, data) {
         return div;
     }
 
-    function createSeasonMenuElement() {
+    function createSeasonMenuElement(seasons) {
         let div = document.createElement('div');
         div.id = 'pl-season';
         div.className = 'dropdown';
@@ -79,13 +80,19 @@ const KSPlayer = function(containerId, data) {
         ul.className = 'dropdown-menu';
         ul.setAttribute('aria-labelledby', 'dropdownSeason');
 
-        let li = document.createElement('li');
-        let a = document.createElement('a');
-        a.href = '#';
-        a.innerText = 'Season';
+        seasons.forEach((item, idx) => {
+            let li = document.createElement('li');
+            let a = document.createElement('a');
+            a.href = '#';
+            a.innerText = item.title;
+            a.setAttribute('data-number', idx);
+            a.onclick = function() { return false; }
+
+            seasonSerials.push(createSerialMenuElement(item.serials));
+            li.appendChild(a);
+            ul.appendChild(li);
+        });
 
-        li.appendChild(a);
-        ul.appendChild(li);
         button.appendChild(text);
         button.appendChild(span);
         div.appendChild(button);
@@ -121,11 +128,13 @@ const KSPlayer = function(containerId, data) {
         containerElement.appendChild(serialMenu);
         containerElement.appendChild(document.createElement('br'));
         containerElement.appendChild(document.createElement('br'));
+    } else if (data.type === 'seasons_serial') {
+        let seasonMenu = createSeasonMenuElement(data.seasons);
+        containerElement.appendChild(seasonMenu);
+        containerElement.appendChild(document.createElement('br'));
+        containerElement.appendChild(document.createElement('br'));
     }
 
-    // let seasonMenu = createSeasonMenuElement();
-    // containerElement.appendChild(seasonMenu);    
-
     containerElement.appendChild(videoElement);
 
     /* --- FUNCTIONS ----------- */

From 01b616fee50d24d483203c9eaac9830cbca40bb8 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 15 Dec 2017 12:29:10 +0300
Subject: [PATCH 05/10] =?UTF-8?q?KSPlayer:=20=D1=83=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=88=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<Space> - воспроизведение/пауза
<Left>/<Right> - перемотка на 5 секунд назад/вперед
<Up>/<Down> - звук громче/тише
<F> - переход в полноэкранный режим
---
 .../kinosearch/webapp/static/js/ksplayer.js   | 71 +++++++++++++++++--
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index 0e369a1..335911d 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -106,6 +106,71 @@ const KSPlayer = function(containerId, data) {
         titleElement.id = 'title';
     }
 
+    function createVideoElement() {
+        let videoElement = document.createElement('video');
+        videoElement.id = 'player';
+        videoElement.className = 'center-block';
+        videoElement.setAttribute('controls', 'controls');
+        videoElement.setAttribute('preload', 'none');
+
+        if (videoElement.requestFullscreen) {
+            videoElement.kspFullScreen = videoElement.requestFullscreen;
+        } else if (videoElement.mozRequestFullScreen) {
+            videoElement.kspFullScreen = videoElement.mozRequestFullScreen; // Firefox
+        } else if (videoElement.webkitRequestFullscreen) {
+            videoElement.kspFullScreen = videoElement.webkitRequestFullscreen; // Chrome and Safari
+        } else {
+            console.warn('KSPlayer: can\'t use fullscreen mode =(');
+            videoElement.kspFullScreen = function() { return false; };
+        }
+
+        videoElement.onkeydown = function(e) {
+            // 32 - Space
+            if (e.keyCode === 32) {
+                if (videoElement.paused) {
+                    videoElement.play();
+                } else {
+                    videoElement.pause();
+                }
+            }
+
+            // 37 - Left arrow
+            if (e.keyCode === 37) {
+                videoElement.currentTime -= 5;
+            }
+            // 39 - Right arrow
+            else if (e.keyCode === 39) {
+                videoElement.currentTime += 5;
+            }
+
+            // 38 - Up arrow
+            if (e.keyCode === 38 && videoElement.volume < 1) {
+                if ((videoElement.volume + 0.1) < 1) {
+                    videoElement.volume += 0.1;
+                } else {
+                    videoElement.volume = 1;
+                }
+            }
+            // 40 - Down arrow
+            else if (e.keyCode === 40 && videoElement.volume > 0) {
+                if ((videoElement.volume - 0.1) >= 0) {
+                    videoElement.volume -= 0.1;
+                } else {
+                    videoElement.volume = 0;
+                }
+            }
+
+            // 70 - F
+            if (e.keyCode === 70) {
+                videoElement.kspFullScreen();
+            }
+
+            return false;
+        }
+
+        return videoElement;
+    }
+
     /* --- CONSTRUCTOR --------- */
 
     const containerElement = document.getElementById(containerId);
@@ -113,11 +178,7 @@ const KSPlayer = function(containerId, data) {
         throw `Container "${containerId}" not found!`;
     }
 
-    let videoElement = document.createElement('video');
-    videoElement.id = 'player';
-    videoElement.className = 'center-block';
-    videoElement.setAttribute('controls', 'controls');
-    videoElement.setAttribute('preload', 'none');
+    let videoElement = createVideoElement();
 
     if (data.hasOwnProperty('title')) {
         this.setTitle(data.title);

From 3adf35b0d7b989c50e9186ee1298726321c2ab0b Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 15 Dec 2017 13:01:28 +0300
Subject: [PATCH 06/10] =?UTF-8?q?KSPlayer:=20=D0=B2=D1=8B=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=20=D1=81=D0=B5=D1=80=D0=B8=D0=B9=20=D0=B8=D0=B7=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/webapp/static/js/ksplayer.js   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index 335911d..a129f99 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -7,6 +7,8 @@ const KSPlayer = function(containerId, data) {
 
     let titleElement;
     let seasonSerials = [];
+    const _self = this;
+    let lastActiveSerialItem;
 
     /* --- PRIVATE FUNCTIONS --- */
 
@@ -40,8 +42,21 @@ const KSPlayer = function(containerId, data) {
             let a = document.createElement('a');
             a.href = '#';
             a.innerText = item.title;
-            a.setAttribute('data-file', item.file);
-            a.onclick = function() { return false; }
+            a.onclick = function() {
+                text.nodeValue = item.title;
+                console.log(text);
+                _self.setTitle(item.title);
+
+                if (lastActiveSerialItem) {
+                    lastActiveSerialItem.classList.remove('active');
+                }
+                li.classList.add('active');
+                lastActiveSerialItem = li;
+
+                setSource(item.file);
+
+                return false;
+            }
 
             li.appendChild(a);
             ul.appendChild(li);
@@ -171,6 +186,10 @@ const KSPlayer = function(containerId, data) {
         return videoElement;
     }
 
+    function setSource(source) {
+        videoElement.src = source;
+    }
+
     /* --- CONSTRUCTOR --------- */
 
     const containerElement = document.getElementById(containerId);

From 4e49c57904592c736ed5a749a7f884c919623585 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 15 Dec 2017 14:50:15 +0300
Subject: [PATCH 07/10] =?UTF-8?q?KSPlayer:=20=D0=B2=D1=8B=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=20=D1=81=D0=B5=D0=B7=D0=BE=D0=BD=D0=BE=D0=B2=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/webapp/static/js/ksplayer.js   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index a129f99..3a67a03 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -9,6 +9,7 @@ const KSPlayer = function(containerId, data) {
     let seasonSerials = [];
     const _self = this;
     let lastActiveSerialItem;
+    let lastActiveSeasonItem;
 
     /* --- PRIVATE FUNCTIONS --- */
 
@@ -75,6 +76,7 @@ const KSPlayer = function(containerId, data) {
         div.id = 'pl-season';
         div.className = 'dropdown';
         div.style = 'display: inline-block';
+        div.kspSerialMenuElement = undefined;
 
         let button = document.createElement('button');
         button.className = 'btn btn-default dropdown-toggle';
@@ -101,7 +103,23 @@ const KSPlayer = function(containerId, data) {
             a.href = '#';
             a.innerText = item.title;
             a.setAttribute('data-number', idx);
-            a.onclick = function() { return false; }
+            a.onclick = function() {
+                text.nodeValue = item.title;
+
+                if (lastActiveSeasonItem) {
+                    lastActiveSeasonItem.classList.remove('active');
+                }
+                li.classList.add('active');
+                lastActiveSeasonItem = li;
+
+                if (div.kspSerialMenuElement) {
+                    containerElement.removeChild(div.kspSerialMenuElement);
+                }
+                containerElement.insertAfter(seasonSerials[idx], div);
+                div.kspSerialMenuElement = seasonSerials[idx];
+
+                return false;
+            }
 
             seasonSerials.push(createSerialMenuElement(item.serials));
             li.appendChild(a);
@@ -197,6 +215,10 @@ const KSPlayer = function(containerId, data) {
         throw `Container "${containerId}" not found!`;
     }
 
+    containerElement.insertAfter = function(newChild, refChild) {
+        this.insertBefore(newChild, refChild.nextSibling);
+    }
+
     let videoElement = createVideoElement();
 
     if (data.hasOwnProperty('title')) {

From 40b8e28fd45d47f70be05665e26379e4639edcec Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 15 Dec 2017 14:51:48 +0300
Subject: [PATCH 08/10] =?UTF-8?q?fix:=20=D0=BE=D1=81=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/kinosearch/webapp/static/js/ksplayer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index 3a67a03..3091951 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -45,7 +45,6 @@ const KSPlayer = function(containerId, data) {
             a.innerText = item.title;
             a.onclick = function() {
                 text.nodeValue = item.title;
-                console.log(text);
                 _self.setTitle(item.title);
 
                 if (lastActiveSerialItem) {

From 09a9b97774d63bd3ab538e8bede0a8de3f1fccc3 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 15 Dec 2017 14:56:13 +0300
Subject: [PATCH 09/10] =?UTF-8?q?KSPlayer:=20=D0=A3=D0=B1=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20=D0=B2=D1=81=D1=91=20=D0=BB=D0=B8=D1=88?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kinosearch/webapp/static/js/ksplayer.js   | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
index 3091951..3596747 100644
--- a/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
+++ b/src/main/resources/kinosearch/webapp/static/js/ksplayer.js
@@ -45,7 +45,7 @@ const KSPlayer = function(containerId, data) {
             a.innerText = item.title;
             a.onclick = function() {
                 text.nodeValue = item.title;
-                _self.setTitle(item.title);
+                setTitle(item.title);
 
                 if (lastActiveSerialItem) {
                     lastActiveSerialItem.classList.remove('active');
@@ -207,6 +207,23 @@ const KSPlayer = function(containerId, data) {
         videoElement.src = source;
     }
 
+    function setTitle(text) {
+        if (text) {
+            if (!titleElement) initTitleElement();
+            titleElement.innerText = text;
+
+            if (!isShowTitle) {
+                containerElement.insertBefore(titleElement, videoElement);
+                isShowTitle = true;
+            }
+        } else {
+            if (isShowTitle && titleElement) {
+                containerElement.removeChild(titleElement);
+                isShowTitle = false;
+            }
+        }
+    }
+
     /* --- CONSTRUCTOR --------- */
 
     const containerElement = document.getElementById(containerId);
@@ -237,27 +254,4 @@ const KSPlayer = function(containerId, data) {
     }
 
     containerElement.appendChild(videoElement);
-
-    /* --- FUNCTIONS ----------- */
-
-    this.getType = function() {
-        return videoType;
-    }
-
-    this.setTitle = function(text) {
-        if (text) {
-            if (!titleElement) initTitleElement();
-            titleElement.innerText = text;
-
-            if (!isShowTitle) {
-                containerElement.insertBefore(titleElement, videoElement);
-                isShowTitle = true;
-            }
-        } else {
-            if (isShowTitle && titleElement) {
-                containerElement.removeChild(titleElement);
-                isShowTitle = false;
-            }
-        }
-    }
 }

From d807d28fc42237466595986d1f2e59485bb87c90 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 15 Dec 2017 14:57:15 +0300
Subject: [PATCH 10/10] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D0=B9=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/kinosearch/webapp/player.ftl    |  21 --
 .../kinosearch/webapp/static/js/player.js     | 199 ------------------
 2 files changed, 220 deletions(-)
 delete mode 100644 src/main/resources/kinosearch/webapp/static/js/player.js

diff --git a/src/main/resources/kinosearch/webapp/player.ftl b/src/main/resources/kinosearch/webapp/player.ftl
index 4e34a61..71e86bf 100644
--- a/src/main/resources/kinosearch/webapp/player.ftl
+++ b/src/main/resources/kinosearch/webapp/player.ftl
@@ -3,27 +3,6 @@
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/js-cookie/2.1.0/js.cookie.min.js"></script>
 <script type="text/javascript" src="/js/ksplayer.js"></script>
 
-<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">
-                <b>Время:</b> <span id="mdl-vtime"></span>
-                <div id="mdl-blk-serial">
-                    <div id="mdl-season" class="hide"><b>Сезон:</b> <span></span></div>
-                    <div id="mdl-serial" class="hide"><b>Серия:</b> <span></span></div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button id="mdl-btn-yes" type="button" class="btn btn-primary" data-dismiss="modal">Да</button>
-                <button id="mdl-btn-no" type="button" class="btn btn-default" data-dismiss="modal">Нет</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <hr>
 
 <div id="ksplayer"></div>
diff --git a/src/main/resources/kinosearch/webapp/static/js/player.js b/src/main/resources/kinosearch/webapp/static/js/player.js
deleted file mode 100644
index 06065ee..0000000
--- a/src/main/resources/kinosearch/webapp/static/js/player.js
+++ /dev/null
@@ -1,199 +0,0 @@
-const PlayerCore = function(playerObj, titleObj, videoData) {
-    this.path = window.location.pathname;
-    this.origDocTitle = document.title;
-    this.timeLast = 0;
-
-    const _this = this;
-
-/* временно отключаю возможность авто-сохранения времени просмотра
-    // сохранение времени просмотра
-    playerObj.bind('play', function() {
-        _this.timeLast = $.now();
-    });
-
-    playerObj.bind('timeupdate', function() {
-        let timeCurrent = $.now();
-        let sec = Math.floor((timeCurrent - _this.timeLast)/1000);
-        if (sec >= 5) {
-            let playerCurrentTime = playerObj[0].currentTime;
-            if (Math.floor(playerCurrentTime) <= 10)
-                return;
-            let save_data = { 'time': playerCurrentTime };
-            Cookies.set(_this.path, save_data, { 'expires': 30 });
-            _this.timeLast = timeCurrent;
-            console.debug({
-                'path': _this.path,
-                'saveTime': save_data
-            }); //TODO убрать на продакшене
-        }
-    });
-*/
-    this.getType = function() {
-        return videoData.type;
-    };
-
-    this.setTitle = function(title) {
-        if (!title) {
-            title = videoData.title;
-        }
-        document.title = title + " :: " + _this.origDocTitle;
-        titleObj.text(title);
-        titleObj.show();
-    };
-
-    this.setupForOneFilm = function() {
-        playerObj.attr('src', videoData.file);
-        playerObj.load();
-    };
-
-    this.setupForSimpleSerial = function(serialBlock) {
-        let menu = serialBlock.find('.dropdown-menu');
-        menu.html('');
-        let _self = this;
-        videoData.serials.forEach(function(item, i) {
-            let aTag = $('<a/>', { 'href': '#', 'text': item.title });
-            aTag.click(function() { 
-                _self.setSerial(i, serialBlock);
-            });
-            let liTag = $('<li/>');
-            liTag.append(aTag);
-            menu.append(liTag);
-        });
-
-        serialBlock.removeClass('hide');
-    };
-
-    this.setupForSeasonSerial = function(seasonBlock, serialBlock) {
-        let menu = seasonBlock.find('.dropdown-menu');
-        menu.html('');
-        let _self = this;
-        videoData.seasons.forEach(function(item, i) {
-            let aTag = $('<a/>', { 'href': '#', 'text': item.title });
-            aTag.click(function() {
-                _self.setSeason(i, seasonBlock, serialBlock);
-            });
-            let liTag = $('<li/>');
-            liTag.append(aTag);
-            menu.append(liTag);
-        });
-
-        seasonBlock.removeClass('hide');
-    };
-
-    this.setSerial = function(idx, serialBlock, sidx) {
-        if (!sidx) {
-            sidx = 0;
-        }
-
-        let title;
-        let playerSrc;
-        if (_this.getType() == 'seasons_serial') {
-            title = videoData.seasons[sidx].serials[idx].title;
-            playerSrc = videoData.seasons[sidx].serials[idx].file;
-        } else {
-            title = videoData.serials[idx].title;
-            playerSrc = videoData.serials[idx].file;
-        }
-        _this.setTitle(title);
-
-        let menuBtn = serialBlock.find('#dropdownSerial');
-        menuBtn.html(title + '&nbsp;<span class="caret"></span>');
-
-        playerObj.attr('src', playerSrc);
-        playerObj.attr('data-serial', idx);
-    };
-
-    this.setTime = function(time) {
-        playerObj[0].currentTime = time;
-    };
-
-    this.load = function() {
-        playerObj.load();
-    };
-};
-
-function msToTime(ms) {
-    function addZ(n) { 
-        return (n < 10 ? '0' : '') + n; 
-    }
-
-    const _ms = ms % 1000;
-    ms = (ms - _ms) / 1000;
-    const _sec = ms % 60;
-    ms = (ms - _sec) / 60;
-    const _min = ms % 60;
-    const _hr = (ms - _min) / 60;
-
-    return {
-        'sec': addZ(_sec),
-        'min': addZ(_min),
-        'hour': addZ(_hr)
-    };
-}
-
-/*
-function loadPlayerCookieData(playerCore) {
-    let data = Cookies.getJSON(playerCore.path);
-
-    if (data != null) {
-        let fulltime = msToTime(data.time * 1000);
-        $('#mdl-vtime').text(fulltime.hour + ':' + fulltime.min + ':' + fulltime.sec);
-
-        if (playerCore.getType() == 'simple_serial') {
-            $('#mdl-serial').find('span').text(data.serial + 1);
-            $('#mdl-serial').removeClass('hide');
-
-            $('#mdl-btn-yes').click(function() {
-                playerCore.setSerial(data.serial, $('#pl-serial'));
-
-                playerCore.setTime(data.time);
-                playerCore.load();
-            });
-
-            $('#mdl-btn-no').click(function() {
-                playerCore.load();
-            });
-        } else if (playerCore.getType() == 'seasons_serial') {
-            $('#mdl-season').find('span').text(data.season + 1);
-            $('#mdl-season').removeClass('hide');
-            $('#mdl-serial').find('span').text(data.serial + 1);
-            $('#mdl-serial').removeClass('hide');
-
-            $('#mdl-btn-yes').click(function() {
-                playerCore.setSeason(data.season, $('#pl-season'));
-                playerCore.setSerial(data.serial, $('#pl-serial'), data.season);
-
-                playerCore.setTime(data.time);
-                playerCore.load();
-            });
-
-            $('#mdl-btn-no').click(function() {
-                playerCore.load();
-            });
-        }
-        $('#modal').modal('show');
-    }
-}
-*/
-
-function initPlayer(video_data) {
-    const playerCore = new PlayerCore($('#player'), $('#title'), video_data);
-
-    // загрузка ранее сохранённых данных
-    //loadPlayerCookieData(playerCore);
-
-    if (playerCore.getType() == 'one_film') {
-        playerCore.setTitle();
-        playerCore.setupForOneFilm();
-    } else if (playerCore.getType() == 'simple_serial') {
-        playerCore.setupForSimpleSerial($('#pl-serial'));
-        $('#title').hide();
-    } else if (playerCore.getType() == 'seasons_serial') {
-        playerCore.setupForSeasonSerial($('#pl-season'), $('#pl-serial'));
-        $('#title').hide();
-    } else {
-        console.debug(video_data); //TODO убрать из продакшена
-    }
-
-    return playerCore;
-}