Skip to content

Commit

Permalink
Merge branch 'enhancement/object-cache-compute-style-properties' into…
Browse files Browse the repository at this point in the history 
… update/59595-fix-tests
  • Loading branch information
@joemcgill
joemcgill committed Jun 3, 2024
2 parents 21c2922 + c938aa5 commit 6becf8d
Show file tree
Hide file tree
Showing 73 changed files with 3,222 additions and 2,145 deletions.
3,384 changes: 1,721 additions & 1,663 deletions package-lock.json
View file

Large diffs are not rendered by default.

144 changes: 72 additions & 72 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"@lodder/grunt-postcss": "^3.1.1",
"@playwright/test": "1.32.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
"@wordpress/babel-preset-default": "7.42.0",
"@wordpress/dependency-extraction-webpack-plugin": "5.9.0",
"@wordpress/e2e-test-utils": "10.29.0",
"@wordpress/e2e-test-utils-playwright": "0.26.0",
"@wordpress/prettier-config": "3.15.0",
"@wordpress/scripts": "27.9.0",
"@wordpress/babel-preset-default": "8.0.0",
"@wordpress/dependency-extraction-webpack-plugin": "6.0.0",
"@wordpress/e2e-test-utils": "11.0.0",
"@wordpress/e2e-test-utils-playwright": "1.0.0",
"@wordpress/prettier-config": "4.0.0",
"@wordpress/scripts": "28.0.0",
"autoprefixer": "10.4.17",
"chalk": "5.3.0",
"check-node-version": "4.2.1",
Expand Down Expand Up @@ -78,72 +78,72 @@
"webpack-livereload-plugin": "3.0.2"
},
"dependencies": {
"@wordpress/a11y": "3.58.0",
"@wordpress/annotations": "2.58.0",
"@wordpress/api-fetch": "6.55.0",
"@wordpress/autop": "3.58.0",
"@wordpress/blob": "3.58.0",
"@wordpress/block-directory": "4.35.0",
"@wordpress/block-editor": "12.26.0",
"@wordpress/block-library": "8.35.0",
"@wordpress/block-serialization-default-parser": "4.58.0",
"@wordpress/blocks": "12.35.0",
"@wordpress/commands": "0.29.0",
"@wordpress/components": "27.6.0",
"@wordpress/compose": "6.35.0",
"@wordpress/core-commands": "0.27.0",
"@wordpress/core-data": "6.35.0",
"@wordpress/customize-widgets": "4.35.0",
"@wordpress/data": "9.28.0",
"@wordpress/data-controls": "3.27.0",
"@wordpress/dataviews": "1.2.0",
"@wordpress/date": "4.58.0",
"@wordpress/deprecated": "3.58.0",
"@wordpress/dom": "3.58.0",
"@wordpress/dom-ready": "3.58.0",
"@wordpress/edit-post": "7.35.0",
"@wordpress/edit-site": "5.35.0",
"@wordpress/edit-widgets": "5.35.0",
"@wordpress/editor": "13.35.0",
"@wordpress/element": "5.35.0",
"@wordpress/escape-html": "2.58.0",
"@wordpress/format-library": "4.35.0",
"@wordpress/hooks": "3.58.0",
"@wordpress/html-entities": "3.58.0",
"@wordpress/i18n": "4.58.0",
"@wordpress/icons": "9.49.0",
"@wordpress/interactivity": "5.7.0",
"@wordpress/interactivity-router": "1.8.0",
"@wordpress/interface": "5.35.0",
"@wordpress/is-shallow-equal": "4.58.0",
"@wordpress/keyboard-shortcuts": "4.35.0",
"@wordpress/keycodes": "3.58.0",
"@wordpress/list-reusable-blocks": "4.35.0",
"@wordpress/media-utils": "4.49.0",
"@wordpress/notices": "4.26.0",
"@wordpress/nux": "8.20.0",
"@wordpress/patterns": "1.19.0",
"@wordpress/plugins": "6.26.0",
"@wordpress/preferences": "3.35.0",
"@wordpress/preferences-persistence": "1.50.0",
"@wordpress/primitives": "3.56.0",
"@wordpress/priority-queue": "2.58.0",
"@wordpress/private-apis": "0.40.0",
"@wordpress/redux-routine": "4.58.0",
"@wordpress/reusable-blocks": "4.35.0",
"@wordpress/rich-text": "6.35.0",
"@wordpress/router": "0.27.0",
"@wordpress/server-side-render": "4.35.0",
"@wordpress/shortcode": "3.58.0",
"@wordpress/style-engine": "1.41.0",
"@wordpress/sync": "0.20.0",
"@wordpress/token-list": "2.58.0",
"@wordpress/undo-manager": "0.18.0",
"@wordpress/url": "3.59.0",
"@wordpress/viewport": "5.35.0",
"@wordpress/warning": "2.58.0",
"@wordpress/widgets": "3.35.0",
"@wordpress/wordcount": "3.58.0",
"@wordpress/a11y": "4.0.0",
"@wordpress/annotations": "3.0.0",
"@wordpress/api-fetch": "7.0.0",
"@wordpress/autop": "4.0.0",
"@wordpress/blob": "4.0.0",
"@wordpress/block-directory": "5.0.0",
"@wordpress/block-editor": "13.0.0",
"@wordpress/block-library": "9.0.0",
"@wordpress/block-serialization-default-parser": "5.0.0",
"@wordpress/blocks": "13.0.0",
"@wordpress/commands": "1.0.0",
"@wordpress/components": "28.0.0",
"@wordpress/compose": "7.0.0",
"@wordpress/core-commands": "1.0.0",
"@wordpress/core-data": "7.0.0",
"@wordpress/customize-widgets": "5.0.0",
"@wordpress/data": "10.0.0",
"@wordpress/data-controls": "4.0.0",
"@wordpress/dataviews": "2.0.0",
"@wordpress/date": "5.0.0",
"@wordpress/deprecated": "4.0.0",
"@wordpress/dom": "4.0.0",
"@wordpress/dom-ready": "4.0.0",
"@wordpress/edit-post": "8.0.0",
"@wordpress/edit-site": "6.0.0",
"@wordpress/edit-widgets": "6.0.0",
"@wordpress/editor": "14.0.0",
"@wordpress/element": "6.0.0",
"@wordpress/escape-html": "3.0.0",
"@wordpress/format-library": "5.0.0",
"@wordpress/hooks": "4.0.0",
"@wordpress/html-entities": "4.0.0",
"@wordpress/i18n": "5.0.0",
"@wordpress/icons": "10.0.0",
"@wordpress/interactivity": "6.0.0",
"@wordpress/interactivity-router": "2.0.0",
"@wordpress/interface": "6.0.0",
"@wordpress/is-shallow-equal": "5.0.0",
"@wordpress/keyboard-shortcuts": "5.0.0",
"@wordpress/keycodes": "4.0.0",
"@wordpress/list-reusable-blocks": "5.0.0",
"@wordpress/media-utils": "5.0.0",
"@wordpress/notices": "5.0.0",
"@wordpress/nux": "9.0.0",
"@wordpress/patterns": "2.0.0",
"@wordpress/plugins": "7.0.0",
"@wordpress/preferences": "4.0.0",
"@wordpress/preferences-persistence": "2.0.0",
"@wordpress/primitives": "4.0.0",
"@wordpress/priority-queue": "3.0.0",
"@wordpress/private-apis": "1.0.0",
"@wordpress/redux-routine": "5.0.0",
"@wordpress/reusable-blocks": "5.0.0",
"@wordpress/rich-text": "7.0.0",
"@wordpress/router": "1.0.0",
"@wordpress/server-side-render": "5.0.0",
"@wordpress/shortcode": "4.0.0",
"@wordpress/style-engine": "2.0.0",
"@wordpress/sync": "1.0.0",
"@wordpress/token-list": "3.0.0",
"@wordpress/undo-manager": "1.0.0",
"@wordpress/url": "4.0.0",
"@wordpress/viewport": "6.0.0",
"@wordpress/warning": "3.0.0",
"@wordpress/widgets": "4.0.0",
"@wordpress/wordcount": "4.0.0",
"backbone": "1.5.0",
"clipboard": "2.0.11",
"core-js-url-browser": "3.6.4",
Expand Down
4 changes: 2 additions & 2 deletions src/js/_enqueues/vendor/plupload/handlers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ function fileQueued( fileObj ) {
jQuery( '<div class="media-item">' )
.attr( 'id', 'media-item-' + fileObj.id )
.addClass( 'child-of-' + postid )
.append( '<div class="progress"><div class="percent">0%</div><div class="bar"></div></div>',
jQuery( '<div class="filename original">' ).text( ' ' + fileObj.name ) )
.append( jQuery( '<div class="filename original">' ).text( ' ' + fileObj.name ),
'<div class="progress"><div class="percent">0%</div><div class="bar"></div></div>' )
.appendTo( jQuery( '#media-items' ) );

// Disable submit.
Expand Down
26 changes: 13 additions & 13 deletions src/wp-admin/async-upload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@
<div class="filename new">
<span class="media-list-title"><strong><?php echo esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ); ?></strong></span>
<span class="media-list-subtitle"><?php echo esc_html( wp_basename( $file ) ); ?></span>
<div class="attachment-tools">
<?php
if ( current_user_can( 'edit_post', $id ) ) {
echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '">' . _x( 'Edit', 'media item' ) . '</a>';
} else {
echo '<span class="edit-attachment">' . _x( 'Success', 'media item' ) . '</span>';
}
?>
<span class="media-item-copy-container copy-to-clipboard-container edit-attachment">
<button type="button" class="button button-small copy-attachment-url" data-clipboard-text="<?php echo $file_url; ?>"><?php _e( 'Copy URL to clipboard' ); ?></button>
<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
</span>
</div>
</div>
</div>
<div class="attachment-tools">
<span class="media-item-copy-container copy-to-clipboard-container edit-attachment">
<button type="button" class="button button-small copy-attachment-url" data-clipboard-text="<?php echo esc_url( $file_url ); ?>"><?php _e( 'Copy URL to clipboard' ); ?></button>
<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
</span>
<?php
if ( current_user_can( 'edit_post', $id ) ) {
echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '">' . _x( 'Edit', 'media item' ) . '</a>';
} else {
echo '<span class="edit-attachment">' . _x( 'Success', 'media item' ) . '</span>';
}
?>
</div>
</div>
<?php
break;
Expand Down
29 changes: 16 additions & 13 deletions src/wp-admin/css/media.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,8 @@
margin-right: 10px;
}

.media-item-wrapper {
display: grid;
grid-template-columns: 1fr 1fr;
}

.media-item .attachment-tools {
display: flex;
justify-content: flex-end;
align-items: center;
}

Expand Down Expand Up @@ -190,15 +184,10 @@
display: none;
}

.media-item .original {
position: relative;
min-height: 34px;
}

.media-item .progress {
float: right;
display: inline-block;
height: 22px;
margin: 7px 6px;
margin: 0 6px 7px;
width: 200px;
line-height: 2em;
padding: 0;
Expand Down Expand Up @@ -1436,3 +1425,17 @@ audio, video {
max-width: 100%;
}
}

@media only screen and (max-width: 375px) {
.media-item .attachment-tools {
align-items: baseline;
}
.media-item .edit-attachment.copy-to-clipboard-container {
flex-direction: column;
}

.copy-to-clipboard-container .success {
line-height: normal;
margin-top: 10px;
}
}
Loading

0 comments on commit 6becf8d

Please sign in to comment.