Audiobooks: narrators as authors, and top-level players.

[wolnelektury.git] / src / catalogue / static / player / player.js

diff --git a/src/catalogue/static/player/player.js b/src/catalogue/static/player/player.js
index cbf9026..f94dc87 100644 (file)
--- a/src/catalogue/static/player/player.js
+++ b/src/catalogue/static/player/player.js
@@ -114,31 +114,28 @@
                 $(".c-media__caption .license", $root).html($(".license", elem).html());
                 $(".c-media__caption .project-logo", $root).html($(".project-icon", elem).html());
 
                 $(".c-media__caption .license", $root).html($(".license", elem).html());
                 $(".c-media__caption .project-logo", $root).html($(".project-icon", elem).html());
 

-                console.log('sm 1');

                 doesUpdateSynchro = false;
                 if (!$currentMedia || $currentMedia[0] != elem[0]) {
                 doesUpdateSynchro = false;
                 if (!$currentMedia || $currentMedia[0] != elem[0]) {

-                    console.log('set', player.jPlayer("setMedia", media))

                     player.jPlayer("option", "playbackRate", speed);
                 }
                 doesUpdateSynchro = true;
                 player.jPlayer(cmd, time);
 
                 $currentMedia = elem;
                     player.jPlayer("option", "playbackRate", speed);
                 }
                 doesUpdateSynchro = true;
                 player.jPlayer(cmd, time);
 
                 $currentMedia = elem;

-                $(".play-next", $root).prop("disabled", !elem.next().length);
+                $(".play-next", $root).prop("disabled", !elem.nextAll('li').length);

 
                 let du = parseFloat(elem.data('duration'));
                 currentDuration = du;
 
                 let du = parseFloat(elem.data('duration'));
                 currentDuration = du;

-                elem.nextAll().each(function() {
+                elem.nextAll('li').each(function() {

                     du += parseFloat($(this).data('duration'));
                 });
                 totalDurationLeft = du;
 
                 let pdu = 0;
                     du += parseFloat($(this).data('duration'));
                 });
                 totalDurationLeft = du;
 
                 let pdu = 0;

-                elem.prevAll().each(function() {
+                elem.prevAll('li').each(function() {

                     pdu += parseFloat($(this).data('duration'));
                 });
                 totalDurationBefore = pdu;
                     pdu += parseFloat($(this).data('duration'));
                 });
                 totalDurationBefore = pdu;

-                console.log('sm 3', du, pdu);

 
                 return player;
             };
 
                 return player;
             };


@@ -166,7 +163,6 @@
                     // TODO: if snap then roll
                     locator.removeClass('up').removeClass('down');
                     if (locator.hasClass('snap')) {
                     // TODO: if snap then roll
                     locator.removeClass('up').removeClass('down');
                     if (locator.hasClass('snap')) {

-                        console.log('SCROLL!');

                         scrollTo();
                     } else {
                         if (y < miny) {
                         scrollTo();
                     } else {
                         if (y < miny) {


@@ -212,14 +208,14 @@
                 });
 
                 $('.play-next', $root).click(function() {
                 });
 
                 $('.play-next', $root).click(function() {

-                    let p = $currentMedia.next();
+                    let p = $currentMedia.nextAll('li').first();

                     if (p.length) {
                         setMedia(p).jPlayer("play");
                         _paq.push(['trackEvent', 'audiobook', 'next']);
                     }
                 });
                 $('.play-prev', $root).click(function() {
                     if (p.length) {
                         setMedia(p).jPlayer("play");
                         _paq.push(['trackEvent', 'audiobook', 'next']);
                     }
                 });
                 $('.play-prev', $root).click(function() {

-                    let p = $currentMedia.prev();
+                    let p = $currentMedia.prevAll('li').first();

                     if (p.length) {
                         setMedia(p).jPlayer("play");
                         _paq.push(['trackEvent', 'audiobook', 'prev']);
                     if (p.length) {
                         setMedia(p).jPlayer("play");
                         _paq.push(['trackEvent', 'audiobook', 'prev']);


@@ -236,10 +232,8 @@
                     _paq.push(['trackEvent', 'audiobook', 'chapter']);
                 });
 
                     _paq.push(['trackEvent', 'audiobook', 'chapter']);
                 });
 

-                console.log('READY 3!');

                 var initialElem = $('.jp-playlist li', $root).first();
                 var initialTime = 0;
                 var initialElem = $('.jp-playlist li', $root).first();
                 var initialTime = 0;

-                console.log('READY 4!');

                 if (true || Modernizr.localstorage) {
                     try {
                         let speedStr = localStorage['audiobook-speed'];
                 if (true || Modernizr.localstorage) {
                     try {
                         let speedStr = localStorage['audiobook-speed'];


@@ -266,9 +260,7 @@
                         initialTime = last[2];
                     }
                 }
                         initialTime = last[2];
                     }
                 }

-                console.log('READY 5!', initialElem, initialTime);

                 setMedia($(initialElem), initialTime);
                 setMedia($(initialElem), initialTime);

-                console.log('READY 6!');

             },
 
             timeupdate: function(event) {
             },
 
             timeupdate: function(event) {


@@ -310,7 +302,7 @@
 
 
             ended: function(event) {
 
 
             ended: function(event) {

-                let p = $currentMedia.next();
+                let p = $currentMedia.nextAll('li');

                 if (p.length) {
                     setMedia(p).jPlayer("play");
                 }
                 if (p.length) {
                     setMedia(p).jPlayer("play");
                 }