Merge pull request #278 from 10up/develop

Release 2.6.1
10up · Jun 7, 2022 · ea6c3a5 · ea6c3a5
2 parents 438274b + d41cc1f
commit ea6c3a5
Show file tree

Hide file tree

Showing 10 changed files with 188 additions and 154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [2.6.1] - 2022-06-07
+
+### Fixed
+- Brightcove API changes break video edit view. Props [@oscarssanchez](https://github.com/oscarssanchez), and [@felipeelia](https://github.com/felipeelia), via [#276](https://github.com/10up/brightcove-video-connect/pull/276).
+
 ## [2.6.0] - 2022-04-19
 
 ### Added
@@ -367,6 +372,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - First release
 
 [Unreleased]: https://github.com/10up/brightcove-video-connect/compare/master...develop
+[2.6.1]: https://github.com/10up/brightcove-video-connect/compare/2.6.0...2.6.1
 [2.6.0]: https://github.com/10up/brightcove-video-connect/compare/2.5.2...2.6.0
 [2.5.2]: https://github.com/10up/brightcove-video-connect/compare/2.5.1...2.5.2
 [2.5.1]: https://github.com/10up/brightcove-video-connect/compare/2.5.0...2.5.1

diff --git a/assets/js/brightcove-admin.js b/assets/js/brightcove-admin.js
diff --git a/assets/js/brightcove-admin.js.map b/assets/js/brightcove-admin.js.map
diff --git a/assets/js/brightcove-admin.min.js b/assets/js/brightcove-admin.min.js
diff --git a/assets/js/src/views/video-edit.js b/assets/js/src/views/video-edit.js
@@ -581,6 +581,10 @@ var VideoEditView = BrightcoveView.extend({
 		this.listenTo(wpbc.broadcast, 'insert:shortcode', this.insertShortcode);
 		options = this.model.toJSON();
 		options.folders = wpbc.preload.folders;
+
+		// Due to a change in the API response, text_tracks might not be defined if the video lacks text_tracks.
+		options.text_tracks = options.text_tracks || [];
+
 		this.model.set('oldFolderId', options.folder_id);
 
 		// Render the model into the template

diff --git a/brightcove-video-connect.php b/brightcove-video-connect.php
@@ -3,7 +3,7 @@
  * Plugin Name: Brightcove Video Connect
  * Plugin URI: https://wordpress.org/plugins/brightcove-video-connect/
  * Description: A Brightcove™ Connector for WordPress that leverages enhanced APIs and Brightcove™ Capabilities
- * Version: 2.6.0
+ * Version: 2.6.1
  * Author: 10up
  * Author URI: http://10up.com
  * License: GPLv2+
@@ -29,7 +29,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  021.0.2301  USA
  */
 
-define( 'BRIGHTCOVE_VERSION', '2.6.0' );
+define( 'BRIGHTCOVE_VERSION', '2.6.1' );
 define( 'BRIGHTCOVE_URL', plugin_dir_url( __FILE__ ) );
 define( 'BRIGHTCOVE_PATH', dirname( __FILE__ ) . '/' );
 define( 'BRIGHTCOVE_BASENAME', plugin_basename( __FILE__ ) );

diff --git a/includes/admin/api/class-bc-admin-media-api.php b/includes/admin/api/class-bc-admin-media-api.php
@@ -1074,12 +1074,14 @@ protected function fetch_videos( $account_id, $count = 10 ) {
 				// Massage the text tracks
 				$result['captions'] = array();
 
-				foreach ( $result['text_tracks'] as $caption ) {
-					$result['captions'][] = array(
-						'source'   => $caption['src'],
-						'language' => $caption['srclang'],
-						'label'    => $caption['label'],
-					);
+				if ( ! empty( $result['text_tracks'] ) ) {
+					foreach ( $result['text_tracks'] as $caption ) {
+						$result['captions'][] = array(
+							'source'   => $caption['src'],
+							'language' => $caption['srclang'],
+							'label'    => $caption['label'],
+						);
+					}
 				}
 			}