Merge branch 'develop' into fix/354

10up · Feb 5, 2024 · ec6153d · ec6153d
2 parents 638dc70 + 1d8f12a
commit ec6153d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/assets/js/src/models/media-collection.js b/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');
 		}
 	},
 

diff --git a/includes/admin/class-bc-admin-menu.php b/includes/admin/class-bc-admin-menu.php
@@ -31,8 +31,8 @@ public function register_admin_menu() {
 			add_submenu_page( 'brightcove', esc_html__( 'Brightcove Labels', 'brightcove' ), esc_html__( 'Labels', 'brightcove' ), 'manage_options', 'brightcove-labels', array( $this, 'render_labels_page' ) );
 
 			// These have no parent menu slug so they don't appear in the menu
-			add_submenu_page( null, esc_html__( 'Add Source', 'brightcove' ), esc_html__( 'Add Source', 'brightcove' ), 'manage_options', 'page-brightcove-edit-source', array( $this, 'render_edit_source_page' ) );
-			add_submenu_page( null, esc_html__( 'Edit Label', 'brightcove' ), esc_html__( 'Edit Label', 'brightcove' ), 'manage_options', 'page-brightcove-edit-label', array( $this, 'render_edit_label_page' ) );
+			add_submenu_page( '', esc_html__( 'Add Source', 'brightcove' ), esc_html__( 'Add Source', 'brightcove' ), 'manage_options', 'page-brightcove-edit-source', array( $this, 'render_edit_source_page' ) );
+			add_submenu_page( '', esc_html__( 'Edit Label', 'brightcove' ), esc_html__( 'Edit Label', 'brightcove' ), 'manage_options', 'page-brightcove-edit-label', array( $this, 'render_edit_label_page' ) );
 
 			remove_submenu_page( 'brightcove', 'brightcove' );
 		}