Merge pull request #384 from 10up/develop

[Release] 2.8.5 - Develop to Master

.gitignore

@@ -3,4 +3,5 @@
 node_modules
 release
 .sass-cache
-vendor
+vendor
+.DS_Store

CHANGELOG.md

@@ -13,6 +13,25 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Security
 -->
 
+## [2.8.5] - 2023-04-22
+
+### Changed
+- Add Select field for labels. Props [@burhandodhy](https://github.com/burhandodhy) via [#378](https://github.com/10up/brightcove-video-connect/pull/378).
+- Cache the API response and display a message from where user can retry the API again. Props [@burhandodhy](https://github.com/burhandodhy) and [@jonnynews](https://github.com/jonnynews) via [#380](https://github.com/10up/brightcove-video-connect/pull/380).
+- Update readme and assets. Props [@jeffpaul](https://github.com/jeffpaul) via [#375](https://github.com/10up/brightcove-video-connect/pull/375).
+
+### Fixed
+- First parameter type of add_submenu_page() when no parent slug is sent. Props [@jonnynews](https://github.com/jonnynews) via [#365](https://github.com/10up/brightcove-video-connect/pull/365).
+- Display error message when the previous request is aborted. Props [@burhandodhy](https://github.com/burhandodhy) via [#368](https://github.com/10up/brightcove-video-connect/pull/368).
+- PHP warning while editing a label. Props [@MARQAS](https://github.com/MARQAS) and [@felipeelia](https://github.com/felipeelia) via [#369](https://github.com/10up/brightcove-video-connect/pull/369).
+- PHP warning while saving a video. Props [@MARQAS](https://github.com/MARQAS) and [@felipeelia](https://github.com/felipeelia) via [#370](https://github.com/10up/brightcove-video-connect/pull/370).
+- Move playlist notice above controls bar. Props [@MARQAS](https://github.com/MARQAS) and [@felipeelia](https://github.com/felipeelia) via [#371](https://github.com/10up/brightcove-video-connect/pull/371).
+- Clicking on the "Edit" and "Preview" buttons for the inactive videos breakes the layout. Props [@burhandodhy](https://github.com/burhandodhy) and [@felipeelia](https://github.com/felipeelia) via [#372](https://github.com/10up/brightcove-video-connect/pull/372).
+- Add support for special characters. Props [@burhandodhy](https://github.com/burhandodhy) and [@cr0ybot](https://github.com/cr0ybot) via [#373](https://github.com/10up/brightcove-video-connect/pull/373).
+- Search box alignment in Media modal. Props [@MARQAS](https://github.com/MARQAS) and [@felipeelia](https://github.com/felipeelia) via [#376](https://github.com/10up/brightcove-video-connect/pull/376).
+- Limit API calls on unwanted admin pages. Props [@burhandodhy](https://github.com/burhandodhy) via [#379](https://github.com/10up/brightcove-video-connect/pull/379).
+- Video update API fails when labels are empty. Props [@burhandodhy](https://github.com/burhandodhy) via [#381](https://github.com/10up/brightcove-video-connect/pull/381).
+
 ## [2.8.4] - 2023-11-30
 
 ### Added
@@ -99,7 +118,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Video and Playlist experiences displays wrong block settings. Props [@Rahmon](https://github.com/Rahmon), and [@oscarssanchez](https://github.com/oscarssanchez) via [#250](https://github.com/10up/brightcove-video-connect/pull/250).
 - Update attribute type from int to string. Props [@Rahmon](https://github.com/Rahmon), and [@oscarssanchez](https://github.com/oscarssanchez) via [#246](https://github.com/10up/brightcove-video-connect/pull/246).
 - Pass sizing attribute to determine if responsiveness should be enabled. Props [@Rahmon](https://github.com/Rahmon), and [@oscarssanchez](https://github.com/oscarssanchez) via [#249](https://github.com/10up/brightcove-video-connect/pull/249).
-- Fix broken Brightcove experiences embedding. Props [@Rahmon](https://github.com/Rahmon), and [@oscarssanchez](https://github.com/oscarssanchez) via [#248](https://github.com/10up/brightcove-video-connect/pull/248)  
+- Fix broken Brightcove experiences embedding. Props [@Rahmon](https://github.com/Rahmon), and [@oscarssanchez](https://github.com/oscarssanchez) via [#248](https://github.com/10up/brightcove-video-connect/pull/248).
 
 ## [2.5.0] - 2021-12-21
 
@@ -136,7 +155,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Breaking Changes
 - BC_Utility API changed:
   - See `set_cache_item` and `delete_cache_item` in `includes/class-bc-utility.php`.
-  - Removed `remove_deleted_players` function. 
+  - Removed `remove_deleted_players` function.
 ### Fixed
 - Undefined index warnings. Props [@sanketio](https://github.com/sanketio) via [#197](https://github.com/10up/brightcove-video-connect/pull/197).
 - Typo for the `$allowedtags` global used in conjunction with wp_kses. Props [@theskinnyghost](https://github.com/theskinnyghost) via [#203](https://github.com/10up/brightcove-video-connect/pull/203).
@@ -443,6 +462,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.8.5]: https://github.com/10up/brightcove-video-connect/compare/2.8.4...2.8.5
 [2.8.4]: https://github.com/10up/brightcove-video-connect/compare/2.8.3...2.8.4
 [2.8.3]: https://github.com/10up/brightcove-video-connect/compare/2.8.2...2.8.3
 [2.8.2]: https://github.com/10up/brightcove-video-connect/compare/2.8.1...2.8.2

README.md

@@ -8,7 +8,7 @@
 
 Are you looking to handle your [Brightcove](https://www.brightcove.com/en/online-video-platform) Video and Playlist library natively from within WordPress?
 
-With this plugin, developed by [10up](http://10up.com), you have the power to handle multiple accounts and video libraries, upload videos and add them to playlists, render shortcodes with your videos and all from within the WordPress admin interface.
+With this plugin, you have the power to handle multiple accounts and video libraries, upload videos and add them to playlists, render shortcodes with your videos and all from within the WordPress admin interface.
 
 ## Support Notice
 
@@ -115,7 +115,7 @@ However, in order for it to work you need to make sure you have multiple audio t
 
 ## Support Level
 
-**Active:** 10up is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress.  Bug reports, feature requests, questions, and pull requests are welcome.
+**Active:** Brightcove is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress.  Bug reports, feature requests, questions, and pull requests are welcome.
 
 ## Changelog
 

assets/css/brightcove_video_connect.css

@@ -89,6 +89,7 @@ div.brightcove-uploader div.brightcove-messages .updated {
 
 .brightcove-modal .brightcove .media-toolbar-primary.search-form input[type=search] {
   float: left;
+  margin: 0;
   padding-bottom: 0px;
   width: 200px; }
 
@@ -129,7 +130,9 @@ div.brightcove-uploader div.brightcove-messages .updated {
   .media-frame:not(.hide-menu) .media-frame-menu {
     width: 300px; } }
 
-.brightcove.media-frame-menu .attachment-detail .playlist-details label.experiencelabel, .brightcove.media-frame-menu .attachment-detail .video-details label.experiencelabel, select.experienceplayer {
+.brightcove.media-frame-menu .attachment-detail .playlist-details label.experiencelabel,
+.brightcove.media-frame-menu .attachment-detail .video-details label.experiencelabel,
+select.experienceplayer {
   width: 100%; }
 
 .bc-page-icon {
@@ -633,15 +636,41 @@ div.brightcove-uploader div.brightcove-messages .updated {
     .brightcove.video-edit .caption-secondary-fields label:nth-child(1) {
       padding-right: 1em; }
     .brightcove.video-edit .caption-secondary-fields label span,
-    .brightcove.video-edit .caption-secondary-fields label input[type="text"],
+    .brightcove.video-edit .caption-secondary-fields label input[type='text'],
     .brightcove.video-edit .caption-secondary-fields label select {
       margin: 0;
       min-width: 100%;
       text-align: left;
       width: 100%; }
-    .brightcove.video-edit .caption-secondary-fields label input[type="checkbox"] {
+    .brightcove.video-edit .caption-secondary-fields label input[type='checkbox'] {
       margin: auto; }
 
+.brightcove.video-edit .bc-labels-list {
+  margin: 0;
+  text-align: left; }
+  .brightcove.video-edit .bc-labels-list li {
+    background-color: #fff;
+    border-radius: 4px;
+    border: 1px solid #8c8f94;
+    display: inline-block;
+    margin: 0 10px 10px 0;
+    white-space: nowrap; }
+  .brightcove.video-edit .bc-labels-list button {
+    background-color: #f6f7f7;
+    border-bottom-left-radius: 4px;
+    border-right: 1px solid #8c8f94;
+    border-top-left-radius: 4px;
+    border: none;
+    cursor: pointer;
+    padding: 10px; }
+  .brightcove.video-edit .bc-labels-list span {
+    float: none; }
+  .brightcove.video-edit .bc-labels-list .label-name {
+    padding: 10px; }
+
+.brightcove.video-edit .add-labels-container select {
+  margin-left: 0; }
+
 .playlist-edit.brightcove.attachment-details {
   width: 100%;
   height: auto;

assets/js/src/models/media-collection.js

@@ -264,14 +264,14 @@ var MediaCollection = Backbone.Collection.extend({
 		return fallback.sync.apply(this, arguments);
 	},
 
-	fetchFail: function () {
+	fetchFail: function (response, textStatus) {
 		if (this.pageNumber > 1) {
 			this.pageNumber--;
 		}
 		wpbc.broadcast.trigger('fetch:finished');
 		wpbc.broadcast.trigger('spinner:off');
-		wpbc.broadcast.trigger('fetch:apiError');
-		if (status === 'abort') {
+		if (textStatus !== 'abort') {
+			wpbc.broadcast.trigger('fetch:apiError');
 		}
 	},