Skip to content

Commit c265eec

Browse files
authored
Merge pull request #207 from 10up/refactor/edit-video-preview-ux
Adjust position of media details in the modal
2 parents 169bc19 + a31387d commit c265eec

File tree

5 files changed

+34
-4
lines changed

5 files changed

+34
-4
lines changed

assets/js/brightcove-admin.js

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/brightcove-admin.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/brightcove-admin.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/src/views/brightcove-media-manager.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,21 @@ var BrightcoveMediaManagerView = BrightcoveView.extend(
321321

322322
this.detailsView.render();
323323
this.detailsView.$el.toggle( true ); // Always show new view
324+
325+
const contentElement = $('.brightcove-modal .media-frame-content').first();
326+
327+
if (contentElement.length) {
328+
const maxTopValue = $('#brightcove-media-frame-content').outerHeight() - this.detailsView.$el.outerHeight();
329+
330+
let topValue = contentElement.scrollTop() - $('#brightcove-media-frame-router').outerHeight() + 25;
331+
332+
if (topValue > maxTopValue) {
333+
topValue = maxTopValue
334+
}
335+
336+
this.detailsView.$el.css('top', topValue > 0 ? topValue : 0 );
337+
}
338+
324339
this.model.get( 'media-collection-view' ).$el.addClass( 'menu-visible' );
325340
mediaView.$el.addClass( 'highlighted' );
326341
wpbc.broadcast.trigger( 'toggle:insertButton', 'enabled' );

includes/admin/class-bc-templates.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public function add_templates() {
1313

1414
<?php /* Used by views/media-manager.js */?>
1515
<script type="text/html" id="tmpl-brightcove-media">
16-
<div class="brightcove media-frame-router"></div>
16+
<div id="brightcove-media-frame-router" class="brightcove media-frame-router"></div>
1717
<div class="brightcove-message message hidden"></div>
18-
<div class="brightcove media-frame-content">
18+
<div id="brightcove-media-frame-content" class="brightcove media-frame-content">
1919
<span id="js-media-loading" class="spinner"></span>
2020
</div>
2121
<div class="brightcove media-frame-menu hidden"></div>

0 commit comments

Comments
 (0)