Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5deb8f1
stage commit for Media Browser table view
martinambrus Jan 30, 2020
cb0ff7d
stage commit for Media Browser table view
martinambrus Jan 30, 2020
173b1fd
stage commit for Media Browser table view
martinambrus Jan 30, 2020
05221d7
stage commit for Media Browser table view
martinambrus Jan 30, 2020
c819685
feat: Media Browser grid/table view switching
martinambrus Feb 3, 2020
c3f0a5e
Merge remote-tracking branch 'remotes/origin/master' into 2277070930-…
martinambrus Feb 3, 2020
bbb0544
Merge branch 'master' into 2277070930-media-browser-sortable-table-view
fvmartin Apr 15, 2020
a7a355b
fix: S3 browser does not display error when bucket data are missing
martinambrus Apr 15, 2020
e86433d
fix: selected bucket not preserved when changing display mode
martinambrus Apr 15, 2020
e75b29b
refactor: table sorter CSS into its own file
martinambrus May 30, 2020
c9037cb
refactor: ONLY table sorter CSS into its own file
martinambrus May 30, 2020
c3b3a67
Merge branch 'master' into 2277070930-media-browser-sortable-table-view
Sep 23, 2020
3905f57
fix:
martinambrus Sep 25, 2020
6dfc4e7
refactor: active browser view type indication on view type icon
martinambrus Sep 25, 2020
03087d1
Merge branch 'editor-js-cleanup' into 2277070930-media-browser-sortab…
martinambrus Sep 25, 2020
4e91aeb
fix: Vimeo loaders invisible or erroring out in JS
martinambrus Sep 26, 2020
3ea6fda
fix: loading indicator not shown for table view
martinambrus Sep 26, 2020
93899c6
Merge branch 'editor-js-cleanup' into 2277070930-media-browser-sortab…
fvmartin Mar 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions css/s3-browser-table-sorter.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 48 additions & 2 deletions css/s3-browser.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,18 @@
font-size: 18px;
width: 3em;
}
.attachments-browser table .icon {
font-size: 5px;
}
.attachments-browser .icon.folder {
display: inline-block;
margin: 1em !important;
background-color: transparent;
overflow: hidden;
}
.attachments-browser table .icon.folder {
margin: 0.5em 1em 0 0 !important;
}
.attachments-browser .icon.folder:before {
content: '';
float: left;
Expand Down Expand Up @@ -113,6 +119,9 @@
width: auto;
height: auto;
}
.attachments-browser table .icon.thumb {
width: 1em;
}
.wp-core-ui .attachments-browser .icon.file {
width: 2.5em;
height: 3em;
Expand All @@ -125,6 +134,11 @@
overflow: hidden;
box-shadow: 1.74em -2.1em 0 0 #A4A7AC inset;
}
.wp-core-ui .attachments-browser table .icon.file {
margin: 0 1.5em 0 0;
float: left;
}

.attachments-browser .attachment-info .thumbnail-image::after {
box-shadow: none;
}
Expand Down Expand Up @@ -265,7 +279,6 @@
top: -27.5px!important;
}
#__assets_browser .filemanager .data li {

width:100%!important;
}
#__assets_browser .attachments-browser ul.data {
Expand Down Expand Up @@ -309,10 +322,19 @@
padding: 16px;
}

#overlay-loader-li #fv-player-shortcode-editor-preview-spinner {
#overlay-loader-item #fv-player-shortcode-editor-preview-spinner {
top: 0;
}

#overlay-loader-item button {
margin: 1em;
}

#overlay-loader-item td {
text-align: center;
position: relative;
}

#__assets_browser .browser-progress-bar {
width: 100%;
min-width: 500px;
Expand Down Expand Up @@ -346,4 +368,28 @@
right: 0;
bottom: 0;
z-index: 10;
}

#__assets_browser tbody tr {
cursor: pointer;
}

#__assets_browser tbody tr.is_folder {
cursor: auto;
}

#__assets_browser tbody tr.selected td {
background-color: #EBF2FA;
}

.media-toolbar-primary.display-mode {
margin: 14px;
}

.media-toolbar-primary.display-mode span {
cursor: pointer;
}

.media-toolbar-primary.display-mode span.inactive {
color: #CACED2;
}
2 changes: 1 addition & 1 deletion css/shortcode-editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
width: 100%;
}
#fv-player-editor-loading-overlay {
background-image: url(../../../../wp-includes/images/wpspin-2x.gif);
background-image: url(../../../../wp-includes/images/wpspin-2x.gif);
background-repeat: no-repeat;
background-position: center;
}
Expand Down
2 changes: 1 addition & 1 deletion flowplayer/fv-flowplayer.min.js

Large diffs are not rendered by default.

96 changes: 49 additions & 47 deletions js/digitalocean-spaces-browser.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
jQuery( function($) {

function fv_flowplayer_dos_browser_load_assets(bucket, path) {
var
$this = jQuery(this),
$media_frame_content = jQuery('.media-frame-content:visible'),
$overlay_div = jQuery('#fv-player-shortcode-editor-preview-spinner').clone().css({
'height': '100%'
}),
ajax_data = {
action: "load_dos_assets",
};

$this.addClass('active').siblings().removeClass('active');

// replace content by the new DOS content
$media_frame_content.html($overlay_div);

if (typeof bucket === 'string' && bucket) {
ajax_data['bucket'] = bucket;
}
if (typeof path === 'string' && path) {
ajax_data['path'] = path;
}

jQuery.post(ajaxurl, ajax_data, function (ret) {
var renderOptions = {};

// add errors, if any
if (ret.err) {
renderOptions['errorMsg'] = ret.err;
}

$media_frame_content.html(renderBrowserPlaceholderHTML(renderOptions));

// hide search, as it's not supported for DOS
jQuery('#media-search-input').parent().hide();

fv_flowplayer_browser_browse(ret.items, { 'breadcrumbs' : 1 });
});

return false;
};

$(document).on("mediaBrowserOpen", function (event) {
fv_flowplayer_media_browser_add_tab('fv_flowplayer_dos_browser_media_tab', 'DigitalOcean Spaces', fv_flowplayer_dos_browser_load_assets);
});
jQuery( function($) {

function fv_flowplayer_dos_browser_load_assets(bucket, path) {
var
$this = jQuery(this),
$media_frame_content = jQuery('.media-frame-content:visible'),
$overlay_div = jQuery('#fv-player-shortcode-editor-preview-spinner').clone().css({
'height': '100%'
}),
ajax_data = {
action: "load_dos_assets",
};

fv_flowplayer_browser_get_function[ 'fv_flowplayer_dos_browser_media_tab' ] = fv_flowplayer_dos_browser_load_assets;

$this.addClass('active').siblings().removeClass('active');

// replace content by the new DOS content
$media_frame_content.html($overlay_div);

if (typeof bucket === 'string' && bucket) {
ajax_data['bucket'] = bucket;
}
if (typeof path === 'string' && path) {
ajax_data['path'] = path;
}

jQuery.post(ajaxurl, ajax_data, function (ret) {
var renderOptions = {};

// add errors, if any
if (ret.err) {
renderOptions['errorMsg'] = ret.err;
}

$media_frame_content.html(renderBrowserPlaceholderHTML(renderOptions));

// hide search, as it's not supported for DOS
jQuery('#media-search-input').parent().hide();

fv_flowplayer_browser_browse(ret.items, { 'breadcrumbs' : 1 });
});

return false;
};

$(document).on("mediaBrowserOpen", function (event) {
fv_flowplayer_media_browser_add_tab('fv_flowplayer_dos_browser_media_tab', 'DigitalOcean Spaces', fv_flowplayer_dos_browser_load_assets);
});
});
Loading