Fix bug: Desc button sometimes out-of-sync with desc state

acri-jp · Feb 23, 2020 · 637dea6 · 637dea6
1 parent 325ba11
commit 637dea6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/build/ableplayer.dist.js b/build/ableplayer.dist.js
@@ -8245,8 +8245,12 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 
 		thisObj = this;
 		if (this.swappingSrc) {
-			// wait until new source has loaded before refreshing controls
-			return;
+  		if (this.playing) {
+  			// wait until new source has loaded before refreshing controls
+  			// can't wait if player is NOT playing because some critical events
+  			// won't fire until playback of new media starts
+        return;
+		  }
 		}
 
 		if (context === 'timeline' || context === 'init') {
@@ -8973,6 +8977,7 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 	};
 
 	AblePlayer.prototype.handleDescriptionToggle = function() {
+
 		this.descOn = !this.descOn;
 		this.prefDesc = + this.descOn; // convert boolean to integer
 		this.updateCookie('prefDesc');

diff --git a/build/ableplayer.js b/build/ableplayer.js
@@ -8245,8 +8245,12 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 
 		thisObj = this;
 		if (this.swappingSrc) {
-			// wait until new source has loaded before refreshing controls
-			return;
+  		if (this.playing) {
+  			// wait until new source has loaded before refreshing controls
+  			// can't wait if player is NOT playing because some critical events
+  			// won't fire until playback of new media starts
+        return;
+		  }
 		}
 
 		if (context === 'timeline' || context === 'init') {
@@ -8973,6 +8977,7 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 	};
 
 	AblePlayer.prototype.handleDescriptionToggle = function() {
+
 		this.descOn = !this.descOn;
 		this.prefDesc = + this.descOn; // convert boolean to integer
 		this.updateCookie('prefDesc');

diff --git a/build/ableplayer.min.js b/build/ableplayer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ableplayer",
-  "version": "4.2.10",
+  "version": "4.2.11",
   "description": "fully accessible HTML5 media player",
   "homepage": "http://ableplayer.github.io/ableplayer",
   "bugs": "https://github.com/ableplayer/ableplayer/issues",

diff --git a/scripts/control.js b/scripts/control.js
@@ -470,8 +470,12 @@
 
 		thisObj = this;
 		if (this.swappingSrc) {
-			// wait until new source has loaded before refreshing controls
-			return;
+  		if (this.playing) {
+  			// wait until new source has loaded before refreshing controls
+  			// can't wait if player is NOT playing because some critical events
+  			// won't fire until playback of new media starts
+        return;
+		  }
 		}
 
 		if (context === 'timeline' || context === 'init') {
@@ -1198,6 +1202,7 @@
 	};
 
 	AblePlayer.prototype.handleDescriptionToggle = function() {
+
 		this.descOn = !this.descOn;
 		this.prefDesc = + this.descOn; // convert boolean to integer
 		this.updateCookie('prefDesc');