Fixed #452. Player state is now accurate without interaction

danpastori · danpastori · commit 021ebf6429d2 · 2021-04-01T20:52:07.000Z
diff --git a/.gitignore b/.gitignore
@@ -7,11 +7,12 @@ icon*
 .vscode
 .sass-cache
 logs/
+.nova/
 
 # AmplitudeJS Specifics
 songs/*
 examples/testing/*
 src/PENDING
 examples/songs
 coverage/
-ui-tests/*
+ui-tests/
diff --git a/dist/amplitude.js b/dist/amplitude.js
diff --git a/dist/amplitude.js.map b/dist/amplitude.js.map
diff --git a/dist/amplitude.min.js b/dist/amplitude.min.js
diff --git a/src/core/core.js b/src/core/core.js
@@ -46,6 +46,12 @@ import Debug from "../utilities/debug.js";
  */
 import Visualizations from "../fx/visualizations.js";
 
+/**
+ * Import the Config State module.
+ * @module utilities/configState
+ */
+ import ConfigState from "../utilities/configState.js";
+
 /**
  * Interacts directly with native functions of the Audio element. Logic
  * leading up to these methods are handled by click handlers which call
@@ -102,6 +108,11 @@ let Core = (function() {
     }
     config.audio.play();
     config.audio.playbackRate = config.playback_speed;
+    
+    /*
+      Sets the state of the player.
+    */
+    ConfigState.setPlayerState();
   }
 
   /**
@@ -123,14 +134,20 @@ let Core = (function() {
 			Flag that pause button was clicked.
 		*/
     config.paused = true;
-
+    
+    
     /*
 			If the song is live, we disconnect the stream so we aren't
 			saving it to memory.
 		*/
     if (config.active_metadata.live) {
       disconnectStream();
     }
+    
+    /*
+      Sets the state of the player.
+    */
+    ConfigState.setPlayerState();
   }
 
   /**
@@ -164,6 +181,11 @@ let Core = (function() {
       disconnectStream();
     }
 
+    /*
+      Sets the state of the player.
+    */
+    ConfigState.setPlayerState();
+  
     /*
 			Run the stop callback
 		*/
diff --git a/src/events/pause.js b/src/events/pause.js
@@ -82,8 +82,6 @@ let Pause = (function() {
       if (playlistAttribute != null && songIndexAttribute != null) {
         handleSongInPlaylistPause(playlistAttribute, songIndexAttribute);
       }
-
-      ConfigState.setPlayerState();
     }
   }
 
diff --git a/src/events/play.js b/src/events/play.js
@@ -94,8 +94,6 @@ let Play = (function() {
       if (playlistAttribute != null && songIndexAttribute != null) {
         handleSongInPlaylistPlay(playlistAttribute, songIndexAttribute);
       }
-
-      ConfigState.setPlayerState();
     }
   }
 
diff --git a/src/events/playPause.js b/src/events/playPause.js
@@ -91,8 +91,6 @@ let PlayPause = (function() {
       if (playlist != null && song != null) {
         handleSongInPlaylistPlayPause(playlist, song);
       }
-
-      ConfigState.setPlayerState();
     }
   }
 
diff --git a/src/events/stop.js b/src/events/stop.js
@@ -49,11 +49,6 @@ let Stop = (function() {
 				Stops the active song.
 			*/
       Core.stop();
-
-      /*
-        Set the state of the player.
-      */
-      ConfigState.setPlayerState();
     }
   }
 
diff --git a/src/index.js b/src/index.js
@@ -761,10 +761,6 @@ let Amplitude = (function() {
 		*/
     TimeElements.resetDurationTimes();
 
-    /*
-      Sets the state of the player.
-    */
-    ConfigState.setPlayerState();
   }
 
   /**
@@ -802,11 +798,6 @@ let Amplitude = (function() {
 		*/
     Core.play();
 
-    /*
-      Sets the state of the player.
-    */
-    ConfigState.setPlayerState();
-
     /*
 			Sync all of the play pause buttons.
 		*/
@@ -858,11 +849,6 @@ let Amplitude = (function() {
 			Play the song
 		*/
     Core.play();
-
-    /*
-			Set the state of the player
-		*/
-    ConfigState.setPlayerState();
   }
 
   /**
@@ -876,8 +862,6 @@ let Amplitude = (function() {
    */
   function play() {
     Core.play();
-
-    ConfigState.setPlayerState();
   }
 
   /**
@@ -891,8 +875,6 @@ let Amplitude = (function() {
    */
   function pause() {
     Core.pause();
-
-    ConfigState.setPlayerState();
   }
 
   /**
@@ -905,8 +887,6 @@ let Amplitude = (function() {
    */
   function stop() {
     Core.stop();
-
-    ConfigState.setPlayerState();
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,6 @@ let Pause = (function() {`
`82`	`82`	`if (playlistAttribute != null && songIndexAttribute != null) {`
`83`	`83`	`handleSongInPlaylistPause(playlistAttribute, songIndexAttribute);`
`84`	`84`	`}`
`85`		`-`
`86`		`- ConfigState.setPlayerState();`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,6 @@ let Play = (function() {`
`94`	`94`	`if (playlistAttribute != null && songIndexAttribute != null) {`
`95`	`95`	`handleSongInPlaylistPlay(playlistAttribute, songIndexAttribute);`
`96`	`96`	`}`
`97`		`-`
`98`		`- ConfigState.setPlayerState();`
`99`	`97`	`}`
`100`	`98`	`}`
`101`	`99`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,6 @@ let PlayPause = (function() {`
`91`	`91`	`if (playlist != null && song != null) {`
`92`	`92`	`handleSongInPlaylistPlayPause(playlist, song);`
`93`	`93`	`}`
`94`		`-`
`95`		`- ConfigState.setPlayerState();`
`96`	`94`	`}`
`97`	`95`	`}`
`98`	`96`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,6 @@ let Stop = (function() {`
`49`	`49`	`Stops the active song.`
`50`	`50`	`*/`
`51`	`51`	`Core.stop();`
`52`		`-`
`53`		`- /*`
`54`		`- Set the state of the player.`
`55`		`- */`
`56`		`- ConfigState.setPlayerState();`
`57`	`52`	`}`
`58`	`53`	`}`
`59`	`54`