Merge remote-tracking branch 'origin/master' into radio-esperanzah-2020

[panikweb-esperanzah.git] / panikweb_templates / static / js / audioPlayer.js

diff --git a/panikweb_templates/static/js/audioPlayer.js b/panikweb_templates/static/js/audioPlayer.js
index 35f1dafd6fefc55df62772ab0feeae30e319a61f..8622f7f2b7bbf83f830f7c7b564ac538eeb62fc5 100644 (file)
--- a/panikweb_templates/static/js/audioPlayer.js
+++ b/panikweb_templates/static/js/audioPlayer.js
@@ -23,6 +23,7 @@
                        onAdd: function(){},
                        onPlay: function(){},
                        onUpdate: function(){},
+                       onEnded: function(){},
                },
                _create: function() {
                // Initialization logic here
@@ -127,8 +128,8 @@
                                }
                                thePlaylist.setFocus(container);
                                container.addClass('playing');
-                               playpause.addClass('icon-pause').removeClass('icon-play');
-                               thePlaylist.controlButtons['playpause'].removeClass('icon-play').addClass('icon-pause');
+                               playpause.addClass('action-pause').removeClass('action-play');
+                               thePlaylist.controlButtons['playpause'].removeClass('action-play').addClass('action-pause');
                                thePlaylist.afterPlay();
                                var sound_id = $(e.target).data('sound-id');
                                $(document).trigger('panik:play', {'sound_id': sound_id});
@@ -145,7 +146,7 @@
                                if (typeof (_paq) == 'object') {
                                        _paq.push(['trackEvent', 'Audio', 'End', audio_str]);
                                }
-                               thePlaylist.playNext();
+                               thePlaylist.ended();
                        }).on('beforePause',function(){
                                return this;
                        }).on('beforePlay',function(){
@@ -159,14 +160,14 @@
                        });
                        var controls = $('<span>',{'class':'soundControls controls'});
                        var link = $('<a>',{href:sound.url,'class':'button icon-external-link'});
-                       var remove = $('<button>',{title:"Remove from list",'class':'icon-remove',click:function(){
+                       var remove = $('<button>',{title:"Remove from list",'class':'no-icon-remove',click:function(){
                                container.remove();
                                thePlaylist._update();
                        }});
                        var stop = $('<button>',{title:"Stop",'class':'icon-stop',click:function(){
                                audio.trigger('stop');
                        }}).hide();
-                       var playpause = $('<button>',{title:"Play/Pause",'class':'icon-play',click:function(){
+                       var playpause = $('<button>',{title:"Play/Pause",'class':'action-play',click:function(){
                                
                                  if (audio[0].paused == false) { audio.trigger('pause');
                                  } else {
@@ -218,26 +219,19 @@
                                thePlaylist._update();
                        }});
                        */
-                       this.registerControl('previous',{'class':"icon-step-backward",click:function(){
-                               thePlaylist.playPrevious();
-                       }});
-                       this.registerControl('stop',{'class':"icon-stop",click: function(){ 
-                               thePlaylist.stopSounds();
-                       }});
-                       this.registerControl('playpause',{'class':"icon-play playPause",click:  function(){
+                       this.registerControl('playpause',{'class':"action-play playPause",click:        function(){
                                thePlaylist.playPauseList();
                        }});
-                       this.registerControl('next',{'class':"icon-step-forward",click: function(){ 
-                               thePlaylist.playNext();
-                       }});
                        return true;
                },
                // Play next sound
                afterPlay: function() {
+                       console.log('after play');
                        this.options.onPlay(this);
                },
                // Play next sound
                beforePlay: function() {
+                       console.log('before play');
                        this.stopSounds();
                },
                // Play next sound
@@ -253,7 +247,7 @@
                },
                // Play next sound
                playPauseList: function() {
-                       if(this.controlButtons['playpause'].hasClass('icon-play')){
+                       if(this.controlButtons['playpause'].hasClass('action-play')){
                                this.getActive().find('audio').trigger('beforePlay').trigger('play');
                        }else{
                                this.getActive().find('audio').trigger('pause');        
@@ -284,10 +278,19 @@
                pauseSounds: function() {
                        this.playlistContainer.find('audio').each(function(){$(this).trigger('pause');});       
                },
+               ended: function() {
+                       this.options.onEnded(this);
+               },
                // stop all sounds.
                stopSounds: function() {
                        this.playlistContainer.find('audio').each(function(){$(this).trigger('stop');});        
                },
+               reset: function() {
+                       this.isActive = false;
+                       this.stopSounds();
+                       this.playlistContainer.find('*').remove();
+                       this._update();
+               }
        });
 })(jQuery);