Commit changes targeted for 1.3.0 to new branch.

Author: joedolson

src/ableplayer.php

@@ -16,14 +16,14 @@
  * License:     MIT
  * License URI: https://github.com/ableplayer/ableplayer-wordpress/blob/master/LICENSE
  * Domain Path: lang
- * Version:     1.2.0
+ * Version:     1.3.0-beta1
  */
 
 // Configure debugging mode.
 define( 'ABLEPLAYER_DEBUG', false );
 
 // Get current version number.
-define( 'ABLEPLAYER_VERSION', '1.2.0' );
+define( 'ABLEPLAYER_VERSION', '1.3.0-beta1' );
 
 register_activation_hook( __FILE__, 'ableplayer_activation' );
 /**
@@ -278,6 +278,10 @@ function able_player_parameters() {
 			'description' => __( 'Set the default volume from 0 to 10; default is 7 to avoid overpowering screen reader audio)', 'ableplayer' ),
 			'options'     => array( '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ),
 		),
+		'sign-src'            => array(
+			'default'     => '',
+			'description' => __( 'Path to a local ASL video, synchronized with the main video.', 'ableplayer' ),
+		),
 		'youtube-id'          => array(
 			'default'     => '',
 			'description' => __( '11-character YouTube ID or a URL to a YouTube video page.', 'ableplayer' ),
@@ -345,6 +349,7 @@ function ableplayer_shortcode( $atts, $content = null ) {
 			'seekinterval'     => '',
 			'nowplaying'       => 'false',
 			'skin'             => '2020',
+			'sign-src'         => '',
 		),
 		$atts,
 		'ableplayer'
@@ -422,6 +427,9 @@ function ableplayer_shortcode( $atts, $content = null ) {
 		if ( ! empty( $all_atts['vimeo-desc-id'] ) ) {
 			$o .= ' data-vimeo-desc-id="' . $all_atts['vimeo-desc-id'] . '"';
 		}
+		if ( ! empty( $all_atts['sign-src'] ) ) {
+			$o .= ' data-sign-src="' . esc_url( $all_atts['sign-src'] ) . '"';
+		}
 		$o .= '>';
 
 		// enclosing tags.

src/build/ableplayer.4.4.1.js

@@ -5813,11 +5813,14 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 				onError: function (x) {
 					deferred.fail();
 				},
-				onStateChange: function (x) {					
+				onStateChange: function (x) {
 					thisObj.getPlayerState().then(function(playerState) {
 
 						// values of playerState: 'playing','paused','buffering','ended'
 						if (playerState === 'playing') {
+							if (thisObj.hasSignLanguage && thisObj.signVideo) {
+								thisObj.signVideo.play(true);
+							}
 							thisObj.playing = true;
 							thisObj.startedPlaying = true;
 							thisObj.paused = false;
@@ -5833,6 +5836,9 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 							if (typeof thisObj.$posterImg !== 'undefined') {
 								thisObj.$posterImg.show();
 							}
+							if(thisObj.hasSignLanguage && thisObj.signVideo) {
+								thisObj.signVideo.pause(true);
+							}
 							thisObj.stoppingYouTube = false;
 							thisObj.seeking = false;
 							thisObj.playing = false;
@@ -8020,6 +8026,10 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 
 		this.seeking = true;
 		this.liveUpdatePending = true;
+		if (this.hasSignLanguage && this.signVideo) {
+			// keep sign languge video in sync
+			this.signVideo.currentTime = this.startTime;
+		}
 		if (this.player === 'html5') {
 			var seekable;
 
@@ -8351,12 +8361,11 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 	AblePlayer.prototype.pauseMedia = function () {
 
 		var thisObj = this;
-
+		if (this.hasSignLanguage && this.signVideo) {
+			this.signVideo.pause(true);
+		}
 		if (this.player === 'html5') {
 			this.media.pause(true);
-			if (this.hasSignLanguage && this.signVideo) {
-				this.signVideo.pause(true);
-			}
 		}
 		else if (this.player === 'youtube') {
 			this.youTubePlayer.pauseVideo();
@@ -8369,12 +8378,12 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 	AblePlayer.prototype.playMedia = function () {
 
 		var thisObj = this;
-
+		if (this.hasSignLanguage && this.signVideo) {
+			this.signVideo.play(true);
+		}
 		if (this.player === 'html5') {
 			this.media.play(true);
-			if (this.hasSignLanguage && this.signVideo) {
-				this.signVideo.play(true);
-			}
+
 		}
 		else if (this.player === 'youtube') {
 			this.youTubePlayer.playVideo();
@@ -13454,7 +13463,11 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 
 (function ($) {
 	AblePlayer.prototype.initSignLanguage = function() {
-
+		if (!this.isIOS() && this.$media.data('sign-src') !== undefined && this.$media.data('sign-src') !== "") {
+			this.hasSignLanguage = true;
+			this.injectSignPlayerCode();
+			return;
+		}
 		// Sign language is only currently supported in HTML5 player, not YouTube or Vimeo
 		if (this.player === 'html5') {
 			// check to see if there's a sign language video accompanying this video
@@ -13503,22 +13516,46 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
 			'tabindex' : '-1'
 		});
 		this.signVideo = this.$signVideo[0];
-		// for each original <source>, add a <source> to the sign <video>
-		for (i=0; i < this.$sources.length; i++) {
+	if(this.$media.data('sign-src'))
 			signSrc = this.$sources[i].getAttribute('data-sign-src');
+		{
 			srcType = this.$sources[i].getAttribute('type');
+			$signSource = $('<source>',{
 			if (signSrc) {
+				'src' : this.$media.data('sign-src'),
 				$signSource = $('<source>',{
+				'type' : 'video/' + this.$media.data('sign-src').substr(-3)
 					'src' : signSrc,
+			});
 					'type' : srcType
+			this.$signVideo.append($signSource);
 				});
+		}
 				this.$signVideo.append($signSource);
+		else {
 			}
+			// for each original <source>, add a <source> to the sign <video>
 			else {
+			for (i=0; i < this.$sources.length; i++) {
 				// source is missing a sign language version
+				signSrc = this.$sources[i].getAttribute('data-sign-src');
 				// can't include sign language
+				srcType = this.$sources[i].getAttribute('type');
 				this.hasSignLanguage = false;
+				if (signSrc) {
 				break;
+					$signSource = $('<source>',{
+						'src' : signSrc,
+						'type' : srcType
+					});
+					this.$signVideo.append($signSource);
+				}
+				else {
+					// source is missing a sign language version
+					// can't include sign language
+					this.hasSignLanguage = false;
+					return;
+				}
 			}
 		}