Merge branch 'develop'

10up · Jan 31, 2018 · d230489 · d230489
2 parents defb51a + d2a522e
commit d230489
Show file tree

Hide file tree

Showing 27 changed files with 1,217 additions and 645 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -109,7 +109,7 @@ module.exports = function ( grunt ) {
 						beautify         : false,
 						preserveComments : 'all',
 						mangle           : {
-							except : ['jQuery']
+							reserved : ['jQuery']
 						},
 						separator: ';\n',
 

diff --git a/README.md b/README.md
@@ -60,6 +60,12 @@ http://httpd.apache.org/docs/current/mod/core.html#limitrequestbody (LimitReques
 
 ## Changelog
 
+##### 1.4.0
+
+* Enhancement: Added player support for videos and playlists
+* Enhancement: Updated playlist api to v2
+* Fix: Fixed a bug that was causing issues when a playlist was edited
+
 ##### 1.3.2
 * Enhancement: Add a target attribute to change shortcode placement
 * Enhancement: Improved performance of search

diff --git a/assets/css/brightcove_video_connect.css b/assets/css/brightcove_video_connect.css
@@ -120,8 +120,7 @@ div.brightcove-uploader div.brightcove-messages .updated {
   padding: 20px;
   box-sizing: border-box;
   border-right: 1px solid #ddd;
-  -webkit-transform: translate3d(0, 0, 0);
-          transform: translate3d(0, 0, 0); }
+  transform: translate3d(0, 0, 0); }
 
 .brightcove-modal .video-preview-frame .brightcove.brightcove.media-frame-menu {
   padding-top: 20px; }
@@ -417,10 +416,7 @@ div.brightcove-uploader div.brightcove-messages .updated {
     .brightcove.media-frame-menu .attachment-detail .video-info .video-created,
     .brightcove.media-frame-menu .attachment-detail .video-info .video-long-description,
     .brightcove.media-frame-menu .attachment-detail .video-info .video-description,
-    .brightcove.media-frame-menu .attachment-detail .video-info .video-id,
-    .brightcove.media-frame-menu .attachment-detail .video-info .video-source,
     .brightcove.media-frame-menu .attachment-detail .video-info .video-updated,
-    .brightcove.media-frame-menu .attachment-detail .video-info .video-player,
     .brightcove.media-frame-menu .attachment-detail .playlist-info .account-name,
     .brightcove.media-frame-menu .attachment-detail .playlist-info .created-date,
     .brightcove.media-frame-menu .attachment-detail .playlist-info .playlist-id,
@@ -429,10 +425,7 @@ div.brightcove-uploader div.brightcove-messages .updated {
     .brightcove.media-frame-menu .attachment-detail .playlist-info .video-created,
     .brightcove.media-frame-menu .attachment-detail .playlist-info .video-long-description,
     .brightcove.media-frame-menu .attachment-detail .playlist-info .video-description,
-    .brightcove.media-frame-menu .attachment-detail .playlist-info .video-id,
-    .brightcove.media-frame-menu .attachment-detail .playlist-info .video-source,
-    .brightcove.media-frame-menu .attachment-detail .playlist-info .video-updated,
-    .brightcove.media-frame-menu .attachment-detail .playlist-info .video-player {
+    .brightcove.media-frame-menu .attachment-detail .playlist-info .video-updated {
       clear: both;
       display: block;
       color: #999;
@@ -445,10 +438,7 @@ div.brightcove-uploader div.brightcove-messages .updated {
       .brightcove.media-frame-menu .attachment-detail .video-info .video-created .title,
       .brightcove.media-frame-menu .attachment-detail .video-info .video-long-description .title,
       .brightcove.media-frame-menu .attachment-detail .video-info .video-description .title,
-      .brightcove.media-frame-menu .attachment-detail .video-info .video-id .title,
-      .brightcove.media-frame-menu .attachment-detail .video-info .video-source .title,
       .brightcove.media-frame-menu .attachment-detail .video-info .video-updated .title,
-      .brightcove.media-frame-menu .attachment-detail .video-info .video-player .title,
       .brightcove.media-frame-menu .attachment-detail .playlist-info .account-name .title,
       .brightcove.media-frame-menu .attachment-detail .playlist-info .created-date .title,
       .brightcove.media-frame-menu .attachment-detail .playlist-info .playlist-id .title,
@@ -457,11 +447,27 @@ div.brightcove-uploader div.brightcove-messages .updated {
       .brightcove.media-frame-menu .attachment-detail .playlist-info .video-created .title,
       .brightcove.media-frame-menu .attachment-detail .playlist-info .video-long-description .title,
       .brightcove.media-frame-menu .attachment-detail .playlist-info .video-description .title,
-      .brightcove.media-frame-menu .attachment-detail .playlist-info .video-id .title,
-      .brightcove.media-frame-menu .attachment-detail .playlist-info .video-source .title,
-      .brightcove.media-frame-menu .attachment-detail .playlist-info .video-updated .title,
-      .brightcove.media-frame-menu .attachment-detail .playlist-info .video-player .title {
+      .brightcove.media-frame-menu .attachment-detail .playlist-info .video-updated .title {
         margin-right: 5px; }
+  .brightcove.media-frame-menu .attachment-detail .video-details .left-col, .brightcove.media-frame-menu .attachment-detail .video-details label, .brightcove.media-frame-menu .attachment-detail .playlist-details .left-col, .brightcove.media-frame-menu .attachment-detail .playlist-details label {
+    display: inline-block;
+    float: left;
+    clear: left;
+    width: 100px;
+    padding-top: 5px; }
+  .brightcove.media-frame-menu .attachment-detail .video-details .right-col, .brightcove.media-frame-menu .attachment-detail .playlist-details .right-col {
+    display: inline-block;
+    float: left;
+    padding-top: 5px; }
+  .brightcove.media-frame-menu .attachment-detail .video-details .clear, .brightcove.media-frame-menu .attachment-detail .playlist-details .clear {
+    clear: both; }
+  .brightcove.media-frame-menu .attachment-detail .video-details input[type=number], .brightcove.media-frame-menu .attachment-detail .playlist-details input[type=number] {
+    width: 20%; }
+  .brightcove.media-frame-menu .attachment-detail .video-details textarea, .brightcove.media-frame-menu .attachment-detail .playlist-details textarea {
+    margin-top: 10px;
+    width: 100%; }
+  .brightcove.media-frame-menu .attachment-detail .video-details #custom, .brightcove.media-frame-menu .attachment-detail .playlist-details #custom {
+    display: none; }
 
 @media screen and (max-width: 700px) {
   .brightcove.media-frame-content {

diff --git a/assets/css/brightcove_video_connect.min.css b/assets/css/brightcove_video_connect.min.css
diff --git a/assets/js/bc-status.min.js b/assets/js/bc-status.min.js
@@ -1,8 +1,4 @@
 ( function( $ ){
-/**
- * Used to provide status warnings from the Brightcove servers.
- */
-jQuery(document).ready(function(a){jQuery(".brightcove-service-error .notice-dismiss").click(function(){var b={action:"bc_status_dismiss",nonce:bcStatus.nonce};
-// Send dismissal to WordPress.
-a.ajax({url:ajaxurl,type:"POST",data:b,complete:function(a){if(!0===a.responseJSON.success){var b=new Date;b.setTime(b.getTime()+3e5);var c="; expires="+b.toGMTString();document.cookie="bc-status-dismissed="+!0+c+"; path=/"}}})})});
+
+jQuery(document).ready(function(e){jQuery(".brightcove-service-error .notice-dismiss").click(function(){var t={action:"bc_status_dismiss",nonce:bcStatus.nonce};e.ajax({url:ajaxurl,type:"POST",data:t,complete:function(e){if(!0===e.responseJSON.success){var t=new Date;t.setTime(t.getTime()+3e5);var s="; expires="+t.toGMTString();document.cookie="bc-status-dismissed="+!0+s+"; path=/"}}})})});
 } )( jQuery );