Merge branch 'poodll3' of https://github.com/justinhunt/moodle-filter…

…_poodll into poodll3
justinhunt · Jun 16, 2023 · a5e09a7 · a5e09a7
2 parents c090207 + 180a855
commit a5e09a7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/amd/src/audioplayer_minimal.js b/amd/src/audioplayer_minimal.js
@@ -9,8 +9,7 @@ define(['jquery','core/log'], function($, log) {
         forwardbutton: '_fpminimal_audioplayer .fpminimal_audioplayer_skip_button_forward',
         timedisplay: '_fpminimal_audioplayer .fpminimal_audioplayer_time'
     }
-    var play_icon_url = require.toUrl('filter/poodll/pix/fpminimal_play.png');
-    var pause_icon_url = require.toUrl('filter/poodll/pix/fpminimal_stop.png');
+
     var skipinterval =15;
 
     var pr = {
@@ -55,10 +54,17 @@ define(['jquery','core/log'], function($, log) {
                 that.update_time();
             });
             $(this.hplayer).on('ended',function(){
-                $(that.ppbutton).css('background-image', play_icon_url);
+                $(that.ppbutton).attr('data-state','ended');
                 //reset the time display
                 $(that.timedisplay).text(that.formatAudioTime(that.duration));
             });
+            $(this.hplayer).on('pause play', function(e) {
+                if (e.currentTarget.paused) {
+                    $(that.ppbutton).attr('data-state','paused');
+                } else {
+                    $(that.ppbutton).attr('data-state','playing');
+                }
+            });
             $(this.hplayer).on('loadeddata',function(){
                 console.log("loadeddata", that.hplayer.duration);
                 if(that.hplayer.duration === Infinity){
@@ -67,6 +73,7 @@ define(['jquery','core/log'], function($, log) {
                 }else {
                     that.duration = that.hplayer.duration;
                 }
+                $(that.ppbutton).attr('data-state','paused');
                 that.update_time();
             });
             $(this.hplayer).on('canplaythrough',function(){
@@ -84,13 +91,13 @@ define(['jquery','core/log'], function($, log) {
                 console.log(this.hplayer);
                 this.hplayer.play().then(function(){
                     log.debug('play promise resolved');
-                    $(that.ppbutton).css('background-image',pause_icon_url);
+                    $(that.ppbutton).attr('data-state','playing');
                 }).catch(function(e){
                     log.debug(e,'play promise rejected');
                 });
             }else{
                 this.hplayer.pause();
-                $(this.ppbutton).css('background-image:', play_icon_url);
+                $(that.ppbutton).attr('data-state','paused');
             }
         },
         update_time: function(){

diff --git a/amd/src/poodll_readaloudmediaskin.js b/amd/src/poodll_readaloudmediaskin.js
@@ -146,13 +146,9 @@ define(['jquery', 'core/log', 'filter_poodll/utils_amd', 'filter_poodll/upskin_r
 
                         break;
 
+                        //not implemented
                     case 'countdownmode':
 
-                        ip.controlbar.status.hide();
-                        self.disable_button(ip.controlbar.startbutton);
-                        self.disable_button(ip.controlbar.testbutton);
-                        self.enable_button(ip.controlbar.placeholderbutton);
-                        self.disable_button(ip.controlbar.stopbutton);
                         break;
 
                     case 'readymode':

diff --git a/pix/fpminimal-pause.svg b/pix/fpminimal-pause.svg
diff --git a/styles.css b/styles.css
@@ -5154,6 +5154,10 @@ video.poodll_multivideoplayer_video {
     top: 36px;
 }
 
+.fpminimal_audioplayer_play_button[data-state="playing"] {
+    background-image: url([[pix:filter_poodll|fpminimal-pause]]);
+}
+
 .fpminimal_audioplayer_skip_buttons {
     display: flex;
     width: 100%;