From ef74eeca44d32b271202010375d6f88590e8a4d8 Mon Sep 17 00:00:00 2001 From: TommusRhodus Date: Wed, 13 Nov 2024 16:45:56 +0000 Subject: [PATCH] Adds new attributes to the audio block. --- .phpcs.xml | 13 +- .prettierrc.yaml | 10 + assets/js/build/editor.asset.php | 5 +- assets/js/build/editor.js | 4 +- assets/js/build/theme-garden.asset.php | 5 +- assets/js/build/theme-install.asset.php | 5 +- assets/js/src/components/audio-block.js | 107 +++++++++ assets/js/src/components/post-formats.js | 231 ++++++++++++++++++++ assets/js/src/editor.js | 266 +---------------------- assets/js/src/theme-garden.js | 4 +- assets/js/src/theme-install.js | 5 +- composer.json | 2 +- composer.lock | 14 +- includes/block-functions.php | 16 +- tumblr-theme-translator.php | 1 + 15 files changed, 385 insertions(+), 303 deletions(-) create mode 100644 .prettierrc.yaml create mode 100644 assets/js/src/components/audio-block.js create mode 100644 assets/js/src/components/post-formats.js diff --git a/.phpcs.xml b/.phpcs.xml index 8bd1cd6..1f2b170 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,11 +3,18 @@ - + + + + + + - - + + + + node_modules/* diff --git a/.prettierrc.yaml b/.prettierrc.yaml new file mode 100644 index 0000000..e5d0786 --- /dev/null +++ b/.prettierrc.yaml @@ -0,0 +1,10 @@ +useTabs: true +tabWidth: 2 +printWidth: 100 +singleQuote: true +trailingComma: es5 +bracketSpacing: true +parenSpacing: true +jsxBracketSameLine: false +semi: true +arrowParens: avoid \ No newline at end of file diff --git a/assets/js/build/editor.asset.php b/assets/js/build/editor.asset.php index f4b44f5..1923707 100644 --- a/assets/js/build/editor.asset.php +++ b/assets/js/build/editor.asset.php @@ -1,4 +1 @@ - array( 'react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-editor', 'wp-i18n', 'wp-plugins' ), - 'version' => '4eb3efbc3546d4a3ffa6', -); + array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-hooks', 'wp-i18n', 'wp-plugins'), 'version' => '8a2ce0508e797b60b350'); diff --git a/assets/js/build/editor.js b/assets/js/build/editor.js index b2d4d5c..fda81d3 100644 --- a/assets/js/build/editor.js +++ b/assets/js/build/editor.js @@ -1,2 +1,2 @@ -(()=>{"use strict";const e=window.React,t=window.wp.plugins,c=window.wp.editor,o=window.wp.i18n,i=window.wp.data,a=window.wp.components,l=window.wp.blockEditor,r=window.wp.blocks,n=[{id:"standard",caption:(0,o.__)("Text"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 20.8 13"},(0,e.createElement)("path",{d:"M.1 13h2.8l.9-3h4.7l.8 3h2.9L7.7 0h-3L.1 13zm6-10.1l2 5.1H4.2l1.9-5.1zM20 10V6c0-1.1-.2-1.9-1-2.3-.7-.5-1.7-.7-2.7-.7-1.6 0-2.7.4-3.4 1.2-.4.5-.6 1.2-.7 2h2.4c.1-.4.2-.6.4-.8.2-.3.6-.4 1.2-.4.5 0 .9.1 1.2.2.3.1.4.4.4.8 0 .3-.2.5-.5.7-.2.1-.5.2-1 .2l-.9.1c-1 .1-1.7.3-2.2.6-.9.5-1.4 1.3-1.4 2.5 0 .9.3 1.6.8 2 .6.5 1.3.9 2.2.9.7 0 1.2-.3 1.7-.6.4-.2.8-.6 1.2-.9 0 .2 0 .4.1.6 0 .2.1.8.2 1h2.7v-.8c-.1-.1-.3-.2-.4-.3.1-.3-.3-1.7-.3-2zm-2.2-1.1c0 .8-.3 1.4-.7 1.7-.4.3-1 .5-1.5.5-.3 0-.6-.1-.9-.3-.2-.2-.4-.5-.4-.9 0-.5.2-.8.6-1 .2-.1.6-.2 1.1-.3l.6-.1c.3-.1.5-.1.7-.2.2-.1.3-.1.5-.2v.8z"}))},{id:"image",caption:(0,o.__)("Image"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 17 15"},(0,e.createElement)("path",{d:"M14.6 1h-2.7l-.6-1h-6l-.6 1H2.4C1.1 1 0 2 0 3.3v9.3C0 13.9 1.1 15 2.4 15h12.2c1.3 0 2.4-1.1 2.4-2.4V3.3C17 2 15.9 1 14.6 1zM8.3 13.1c-2.9 0-5.2-2.3-5.2-5.1s2.3-5.1 5.2-5.1c2.9 0 5.2 2.3 5.2 5.1s-2.3 5.1-5.2 5.1zm5.9-8.3c-.6 0-1.1-.5-1.1-1.1 0-.6.5-1.1 1.1-1.1s1.1.5 1.1 1.1c0 .6-.5 1.1-1.1 1.1zm-10 3.1c0 1.2.5 2.2 1.3 3 0-.2 0-.4-.1-.6 0-2.2 1.8-4 4.1-4 1.1 0 2 .4 2.8 1.1-.3-2-2-3.4-4-3.4-2.2-.1-4.1 1.7-4.1 3.9z"}))},{id:"gallery",caption:(0,o.__)("Gallery"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 24 24"},(0,e.createElement)("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M16 3H4C3.44772 3 3 3.44772 3 4V16C3 16.5523 3.44772 17 4 17C4.55229 17 5 16.5523 5 16V8C5 6.34315 6.34315 5 8 5H16C16.5523 5 17 4.55228 17 4C17 3.44772 16.5523 3 16 3ZM20 5C19.4477 5 19 4.55228 19 4C19 2.34315 17.6569 1 16 1H4C2.34315 1 1 2.34315 1 4V16C1 17.6569 2.34315 19 4 19C4.55229 19 5 19.4477 5 20C5 21.6569 6.34315 23 8 23H20C21.6569 23 23 21.6569 23 20V8C23 6.34315 21.6569 5 20 5ZM14 10C14 11.1046 13.1046 12 12 12C10.8954 12 10 11.1046 10 10C10 8.89543 10.8954 8 12 8C13.1046 8 14 8.89543 14 10ZM7 17.6829C7 17.4082 7.11304 17.1455 7.31257 16.9567L8.79638 15.5522C9.54271 14.8457 10.7029 14.8198 11.48 15.4923L12.4939 16.3698C12.9005 16.7216 13.5125 16.689 13.8794 16.2959L16.3619 13.636C17.1761 12.7637 18.568 12.7938 19.3437 13.7005L20.7599 15.3557C20.9148 15.5368 21 15.7674 21 16.0058V20C21 20.5523 20.5523 21 20 21H8C7.44772 21 7 20.5523 7 20V17.6829Z"}))},{id:"quote",caption:(0,o.__)("Quote"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 17 13"},(0,e.createElement)("path",{d:"M3.5 5.5C4 3.7 5.8 2.4 7.2 1.3L5.9 0C3 1.8 0 5 0 8.5 0 11 1.3 13 4 13c2 0 3.7-1.5 3.7-3.6C7.7 7 6 5.5 3.5 5.5zm9.3 0c.4-1.8 2.2-3.1 3.7-4.2L15.2 0c-2.8 1.8-5.9 5-5.9 8.5 0 2.4 1.3 4.5 4 4.5 2 0 3.7-1.5 3.7-3.6 0-2.4-1.7-3.9-4.2-3.9z"}))},{id:"link",caption:(0,o.__)("Link"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 17 17"},(0,e.createElement)("path",{d:"M9.9 5.1c-.2.3-.5 1.4-.6 2.6l1.1-.1c.7-.1 1.3-.3 1.5-.5.6-.6.6-1.4 0-2-.6-.5-1.4-.5-2 0zM8.5 0C3.8 0 0 3.8 0 8.5S3.8 17 8.5 17 17 13.2 17 8.5 13.2 0 8.5 0zm4.4 8.2c-.5.5-1.5.8-2.5.9l-1.2.2c-.1 1.3-.4 2.9-1 3.6-1.1 1.1-3 1.2-4.1 0-1.1-1.1-1.1-3 0-4.1.5-.5 1.5-.8 2.6-.9v1.5c-1.2.3-1.5.5-1.6.5-.6.6-.6 1.4 0 2 .5.5 1.4.5 2 0 .2-.2.5-1.1.6-2.5l.1-.9c0-1.3.2-3.6 1-4.4 1.1-1.1 3-1.2 4.1 0 1.2 1.1 1.2 2.9 0 4.1z"}))},{id:"chat",caption:(0,o.__)("Chat"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 18.7 17"},(0,e.createElement)("path",{d:"M16 6.1V2.6C16 .8 15 0 13.1 0H2.9C1 0 0 1.1 0 3.3v10.4C0 15.9 1 17 2.9 17h10.2c1.9 0 2.9-.8 2.9-2.6v-2.9l2.7-2.9c0-.1-2.7-2.5-2.7-2.5zm-4.5-.7c0-.5.3-.8.7-.8s.8.3.8.8v1.7l-.3 2.5c0 .3-.2.4-.4.4s-.4-.1-.4-.4l-.3-2.5V5.4zm-3.8 6.4c0 .4-.1.8-.7.8-.5 0-.7-.4-.7-.8V9.1C6.3 8.4 6 8 5.4 8c-.5 0-1 .4-1 1.2v2.6c0 .4-.1.8-.7.8s-.7-.4-.7-.8V5.4c0-.5.3-.8.7-.8.4 0 .7.3.7.8v2.1c.3-.4.7-.8 1.5-.8s1.7.5 1.7 2c.1.1.1 3.1.1 3.1zm2.5 0c0 .4-.1.8-.7.8-.5 0-.7-.4-.7-.8V7.5c0-.4.1-.8.7-.8.5 0 .7.4.7.8v4.3zm-.7-5.6c-.4 0-.7-.4-.7-.8s.3-.8.7-.8c.4 0 .7.4.7.8s-.3.8-.7.8zm2.8 6.3c-.4 0-.8-.4-.8-.9s.3-.9.8-.9.8.4.8.9-.4.9-.8.9z"}))},{id:"audio",caption:(0,o.__)("Audio"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 19 16"},(0,e.createElement)("path",{d:"M17.7 7.3c-.4-4.4-4-7.3-8.3-7.3-4.3 0-7.9 2.9-8.3 7.4C.5 7.4 0 8 0 8.6v5c0 .8.6 1.4 1.3 1.4H4c.2.4.8 1 1.2 1 .6 0 .8-1 .8-1.6V7.8c0-.5-.2-1.6-.8-1.6-.4 0-1 .8-1.2 1.1H2.9c.4-3.5 3.2-5.6 6.5-5.6s6.2 2.1 6.5 5.6H15c0-.3-.7-1.1-1.1-1.1-.6 0-.9 1-.9 1.6v6.6c0 .5.3 1.6.9 1.6.4 0 1.1-.6 1.2-1h2.6c.7 0 1.3-.6 1.3-1.3v-5c0-.8-.6-1.3-1.3-1.4zM3 8.5v1l-2 1.3V8.5h2zm15 .9l-2 1.3V8.5h2v.9zm-6.4.3l-1.6.5V6.4c0-.1-.1-.2-.2-.2s-.2 0-.2.1L7.2 12v.2c.1.1.1.1.2.1L9 12v3.8c0 .1-.2.2-.1.2h.3c.1 0 .2 0 .2-.1l2.4-5.9v-.2c-.1-.1-.2-.1-.2-.1z"}))},{id:"video",caption:(0,o.__)("Video"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 16 15"},(0,e.createElement)("path",{d:"M15.7 7.8c-.2-.1-.5 0-.6.1l-2.9 2.2c-.1.1-.1.1-.2.1V8H0v3h2v3.2c0 .4.3.8.8.8h8.4c.5 0 .8-.4.8-.8V12c0 .1.1.2.2.2l2.9 2.2c.2.2.4.2.6.1.2-.1.3-.3.3-.5V8.4c0-.2-.1-.5-.3-.6zM2.8 6.9c.3 0 .8.1 1.1.1h5.5c.3 0 .8-.1 1-.1 1.6-.3 2.8-1.7 2.8-3.4 0-1.9-1.6-3.5-3.5-3.5-1.2 0-2.4.6-3 1.7h-.1C5.9.6 4.8 0 3.6 0 1.6 0 0 1.6 0 3.5c0 1.7 1.2 3 2.8 3.4zM9 4.2c1 0 1.8-.8 1.8-1.8v-.3c.4.3.6.8.6 1.4 0 1-.8 1.8-1.8 1.8-.9 0-1.6-.6-1.8-1.5.3.3.7.4 1.2.4zm-6.2.1c1 0 1.8-.8 1.8-1.8v-.3c.4.2.6.7.6 1.3 0 1-.8 1.8-1.8 1.8-.9 0-1.6-.6-1.8-1.5.3.3.7.5 1.2.5z"}))}];(0,t.registerPlugin)("tumblr3-updated-postformat-ui",{render:()=>{const{editPost:t}=(0,i.useDispatch)("core/editor"),s=(0,i.useSelect)((e=>e("core/editor").getEditedPostAttribute("format")),[]),d=(0,i.useSelect)((e=>e(l.store).getBlocks()),[]),h=(e=>{if(e.length>2)return null;let t;if(1===e.length&&(t=e[0].name,"core/embed"===t)){const c=e[0].attributes?.providerNameSlug;["youtube","vimeo"].includes(c)?t="core/video":["spotify","soundcloud"].includes(c)&&(t="core/audio")}switch(2===e.length&&"core/paragraph"===e[1].name&&(t=e[0].name),t){case"core/image":return"image";case"core/quote":case"core/pullquote":return"quote";case"core/gallery":return"gallery";case"core/video":return"video";case"core/audio":return"audio";default:return null}})(d),m=e=>{if(t({format:e}),!(d.length>1||1===d.length&&"core/paragraph"!==d[0].name))switch(e){case"image":(0,i.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/image"),0);break;case"quote":(0,i.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/quote"),0);break;case"gallery":(0,i.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/gallery"),0);break;case"video":(0,i.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/video"),0);break;case"audio":(0,i.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/audio"),0)}};return(0,e.createElement)(c.PluginPostStatusInfo,null,(0,e.createElement)("div",{className:"tumblr3-post-format-selector"},(0,e.createElement)("p",null,(0,e.createElement)("strong",null,(0,o.__)("Post Formats","tumblr3"))),n.map((({id:t,caption:c,icon:o})=>(0,e.createElement)(a.Button,{key:t,onClick:()=>m(t),className:`post-format-${t} ${t===s?"active":""}`,align:"center"},o,c))),(0,e.createElement)("span",null),h&&h!==s&&(0,e.createElement)("p",{className:"editor-post-format__suggestion"},(0,e.createElement)(a.Button,{__next40pxDefaultSize:!0,variant:"link",onClick:()=>m(h),style:{width:"100%"}},(0,o.sprintf)(/* translators: %s: post format */ /* translators: %s: post format */ -(0,o.__)("Apply suggested format: %s","tumblr3"),h)))))}})})(); \ No newline at end of file +(()=>{"use strict";const e=window.React,t=window.wp.plugins,c=window.wp.editor,a=window.wp.i18n,l=window.wp.data,o=window.wp.components,i=window.wp.blockEditor,r=window.wp.blocks,n=[{id:"standard",caption:(0,a.__)("Text"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 20.8 13"},(0,e.createElement)("path",{d:"M.1 13h2.8l.9-3h4.7l.8 3h2.9L7.7 0h-3L.1 13zm6-10.1l2 5.1H4.2l1.9-5.1zM20 10V6c0-1.1-.2-1.9-1-2.3-.7-.5-1.7-.7-2.7-.7-1.6 0-2.7.4-3.4 1.2-.4.5-.6 1.2-.7 2h2.4c.1-.4.2-.6.4-.8.2-.3.6-.4 1.2-.4.5 0 .9.1 1.2.2.3.1.4.4.4.8 0 .3-.2.5-.5.7-.2.1-.5.2-1 .2l-.9.1c-1 .1-1.7.3-2.2.6-.9.5-1.4 1.3-1.4 2.5 0 .9.3 1.6.8 2 .6.5 1.3.9 2.2.9.7 0 1.2-.3 1.7-.6.4-.2.8-.6 1.2-.9 0 .2 0 .4.1.6 0 .2.1.8.2 1h2.7v-.8c-.1-.1-.3-.2-.4-.3.1-.3-.3-1.7-.3-2zm-2.2-1.1c0 .8-.3 1.4-.7 1.7-.4.3-1 .5-1.5.5-.3 0-.6-.1-.9-.3-.2-.2-.4-.5-.4-.9 0-.5.2-.8.6-1 .2-.1.6-.2 1.1-.3l.6-.1c.3-.1.5-.1.7-.2.2-.1.3-.1.5-.2v.8z"}))},{id:"image",caption:(0,a.__)("Image"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 17 15"},(0,e.createElement)("path",{d:"M14.6 1h-2.7l-.6-1h-6l-.6 1H2.4C1.1 1 0 2 0 3.3v9.3C0 13.9 1.1 15 2.4 15h12.2c1.3 0 2.4-1.1 2.4-2.4V3.3C17 2 15.9 1 14.6 1zM8.3 13.1c-2.9 0-5.2-2.3-5.2-5.1s2.3-5.1 5.2-5.1c2.9 0 5.2 2.3 5.2 5.1s-2.3 5.1-5.2 5.1zm5.9-8.3c-.6 0-1.1-.5-1.1-1.1 0-.6.5-1.1 1.1-1.1s1.1.5 1.1 1.1c0 .6-.5 1.1-1.1 1.1zm-10 3.1c0 1.2.5 2.2 1.3 3 0-.2 0-.4-.1-.6 0-2.2 1.8-4 4.1-4 1.1 0 2 .4 2.8 1.1-.3-2-2-3.4-4-3.4-2.2-.1-4.1 1.7-4.1 3.9z"}))},{id:"gallery",caption:(0,a.__)("Gallery"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 24 24"},(0,e.createElement)("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M16 3H4C3.44772 3 3 3.44772 3 4V16C3 16.5523 3.44772 17 4 17C4.55229 17 5 16.5523 5 16V8C5 6.34315 6.34315 5 8 5H16C16.5523 5 17 4.55228 17 4C17 3.44772 16.5523 3 16 3ZM20 5C19.4477 5 19 4.55228 19 4C19 2.34315 17.6569 1 16 1H4C2.34315 1 1 2.34315 1 4V16C1 17.6569 2.34315 19 4 19C4.55229 19 5 19.4477 5 20C5 21.6569 6.34315 23 8 23H20C21.6569 23 23 21.6569 23 20V8C23 6.34315 21.6569 5 20 5ZM14 10C14 11.1046 13.1046 12 12 12C10.8954 12 10 11.1046 10 10C10 8.89543 10.8954 8 12 8C13.1046 8 14 8.89543 14 10ZM7 17.6829C7 17.4082 7.11304 17.1455 7.31257 16.9567L8.79638 15.5522C9.54271 14.8457 10.7029 14.8198 11.48 15.4923L12.4939 16.3698C12.9005 16.7216 13.5125 16.689 13.8794 16.2959L16.3619 13.636C17.1761 12.7637 18.568 12.7938 19.3437 13.7005L20.7599 15.3557C20.9148 15.5368 21 15.7674 21 16.0058V20C21 20.5523 20.5523 21 20 21H8C7.44772 21 7 20.5523 7 20V17.6829Z"}))},{id:"quote",caption:(0,a.__)("Quote"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 17 13"},(0,e.createElement)("path",{d:"M3.5 5.5C4 3.7 5.8 2.4 7.2 1.3L5.9 0C3 1.8 0 5 0 8.5 0 11 1.3 13 4 13c2 0 3.7-1.5 3.7-3.6C7.7 7 6 5.5 3.5 5.5zm9.3 0c.4-1.8 2.2-3.1 3.7-4.2L15.2 0c-2.8 1.8-5.9 5-5.9 8.5 0 2.4 1.3 4.5 4 4.5 2 0 3.7-1.5 3.7-3.6 0-2.4-1.7-3.9-4.2-3.9z"}))},{id:"link",caption:(0,a.__)("Link"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 17 17"},(0,e.createElement)("path",{d:"M9.9 5.1c-.2.3-.5 1.4-.6 2.6l1.1-.1c.7-.1 1.3-.3 1.5-.5.6-.6.6-1.4 0-2-.6-.5-1.4-.5-2 0zM8.5 0C3.8 0 0 3.8 0 8.5S3.8 17 8.5 17 17 13.2 17 8.5 13.2 0 8.5 0zm4.4 8.2c-.5.5-1.5.8-2.5.9l-1.2.2c-.1 1.3-.4 2.9-1 3.6-1.1 1.1-3 1.2-4.1 0-1.1-1.1-1.1-3 0-4.1.5-.5 1.5-.8 2.6-.9v1.5c-1.2.3-1.5.5-1.6.5-.6.6-.6 1.4 0 2 .5.5 1.4.5 2 0 .2-.2.5-1.1.6-2.5l.1-.9c0-1.3.2-3.6 1-4.4 1.1-1.1 3-1.2 4.1 0 1.2 1.1 1.2 2.9 0 4.1z"}))},{id:"chat",caption:(0,a.__)("Chat"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 18.7 17"},(0,e.createElement)("path",{d:"M16 6.1V2.6C16 .8 15 0 13.1 0H2.9C1 0 0 1.1 0 3.3v10.4C0 15.9 1 17 2.9 17h10.2c1.9 0 2.9-.8 2.9-2.6v-2.9l2.7-2.9c0-.1-2.7-2.5-2.7-2.5zm-4.5-.7c0-.5.3-.8.7-.8s.8.3.8.8v1.7l-.3 2.5c0 .3-.2.4-.4.4s-.4-.1-.4-.4l-.3-2.5V5.4zm-3.8 6.4c0 .4-.1.8-.7.8-.5 0-.7-.4-.7-.8V9.1C6.3 8.4 6 8 5.4 8c-.5 0-1 .4-1 1.2v2.6c0 .4-.1.8-.7.8s-.7-.4-.7-.8V5.4c0-.5.3-.8.7-.8.4 0 .7.3.7.8v2.1c.3-.4.7-.8 1.5-.8s1.7.5 1.7 2c.1.1.1 3.1.1 3.1zm2.5 0c0 .4-.1.8-.7.8-.5 0-.7-.4-.7-.8V7.5c0-.4.1-.8.7-.8.5 0 .7.4.7.8v4.3zm-.7-5.6c-.4 0-.7-.4-.7-.8s.3-.8.7-.8c.4 0 .7.4.7.8s-.3.8-.7.8zm2.8 6.3c-.4 0-.8-.4-.8-.9s.3-.9.8-.9.8.4.8.9-.4.9-.8.9z"}))},{id:"audio",caption:(0,a.__)("Audio"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 19 16"},(0,e.createElement)("path",{d:"M17.7 7.3c-.4-4.4-4-7.3-8.3-7.3-4.3 0-7.9 2.9-8.3 7.4C.5 7.4 0 8 0 8.6v5c0 .8.6 1.4 1.3 1.4H4c.2.4.8 1 1.2 1 .6 0 .8-1 .8-1.6V7.8c0-.5-.2-1.6-.8-1.6-.4 0-1 .8-1.2 1.1H2.9c.4-3.5 3.2-5.6 6.5-5.6s6.2 2.1 6.5 5.6H15c0-.3-.7-1.1-1.1-1.1-.6 0-.9 1-.9 1.6v6.6c0 .5.3 1.6.9 1.6.4 0 1.1-.6 1.2-1h2.6c.7 0 1.3-.6 1.3-1.3v-5c0-.8-.6-1.3-1.3-1.4zM3 8.5v1l-2 1.3V8.5h2zm15 .9l-2 1.3V8.5h2v.9zm-6.4.3l-1.6.5V6.4c0-.1-.1-.2-.2-.2s-.2 0-.2.1L7.2 12v.2c.1.1.1.1.2.1L9 12v3.8c0 .1-.2.2-.1.2h.3c.1 0 .2 0 .2-.1l2.4-5.9v-.2c-.1-.1-.2-.1-.2-.1z"}))},{id:"video",caption:(0,a.__)("Video"),icon:(0,e.createElement)("svg",{height:"35",width:"40",viewBox:"0 0 16 15"},(0,e.createElement)("path",{d:"M15.7 7.8c-.2-.1-.5 0-.6.1l-2.9 2.2c-.1.1-.1.1-.2.1V8H0v3h2v3.2c0 .4.3.8.8.8h8.4c.5 0 .8-.4.8-.8V12c0 .1.1.2.2.2l2.9 2.2c.2.2.4.2.6.1.2-.1.3-.3.3-.5V8.4c0-.2-.1-.5-.3-.6zM2.8 6.9c.3 0 .8.1 1.1.1h5.5c.3 0 .8-.1 1-.1 1.6-.3 2.8-1.7 2.8-3.4 0-1.9-1.6-3.5-3.5-3.5-1.2 0-2.4.6-3 1.7h-.1C5.9.6 4.8 0 3.6 0 1.6 0 0 1.6 0 3.5c0 1.7 1.2 3 2.8 3.4zM9 4.2c1 0 1.8-.8 1.8-1.8v-.3c.4.3.6.8.6 1.4 0 1-.8 1.8-1.8 1.8-.9 0-1.6-.6-1.8-1.5.3.3.7.4 1.2.4zm-6.2.1c1 0 1.8-.8 1.8-1.8v-.3c.4.2.6.7.6 1.3 0 1-.8 1.8-1.8 1.8-.9 0-1.6-.6-1.8-1.5.3.3.7.5 1.2.5z"}))}];(0,t.registerPlugin)("tumblr3-updated-postformat-ui",{render:()=>{const{editPost:t}=(0,l.useDispatch)("core/editor"),d=(0,l.useSelect)((e=>e("core/editor").getEditedPostAttribute("format")),[]),s=(0,l.useSelect)((e=>e(i.store).getBlocks()),[]),m=(e=>{if(e.length>2)return null;let t;if(1===e.length&&(t=e[0].name,"core/embed"===t)){const c=e[0].attributes?.providerNameSlug;["youtube","vimeo"].includes(c)?t="core/video":["spotify","soundcloud"].includes(c)&&(t="core/audio")}switch(2===e.length&&"core/paragraph"===e[1].name&&(t=e[0].name),t){case"core/image":return"image";case"core/quote":case"core/pullquote":return"quote";case"core/gallery":return"gallery";case"core/video":return"video";case"core/audio":return"audio";default:return null}})(s),u=e=>{if(t({format:e}),!(s.length>1||1===s.length&&"core/paragraph"!==s[0].name))switch(e){case"image":(0,l.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/image"),0);break;case"quote":(0,l.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/quote"),0);break;case"gallery":(0,l.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/gallery"),0);break;case"video":(0,l.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/video"),0);break;case"audio":(0,l.dispatch)("core/block-editor").insertBlocks((0,r.createBlock)("core/audio"),0)}};return(0,e.createElement)(c.PluginPostStatusInfo,null,(0,e.createElement)("div",{className:"tumblr3-post-format-selector"},(0,e.createElement)("p",null,(0,e.createElement)("strong",null,(0,a.__)("Post Formats","tumblr3"))),n.map((({id:t,caption:c,icon:a})=>(0,e.createElement)(o.Button,{key:t,onClick:()=>u(t),className:`post-format-${t} ${t===d?"active":""}`,align:"center"},a,c))),(0,e.createElement)("span",null),m&&m!==d&&(0,e.createElement)("p",{className:"editor-post-format__suggestion"},(0,e.createElement)(o.Button,{__next40pxDefaultSize:!0,variant:"link",onClick:()=>u(m),style:{width:"100%"}},(0,a.sprintf)(/* translators: %s: post format */ /* translators: %s: post format */ +(0,a.__)("Apply suggested format: %s","tumblr3"),m)))))}});const d=window.wp.hooks,s=window.wp.compose;(0,d.addFilter)("blocks.registerBlockType","tumblr3/extend-audio-block",((e,t)=>(void 0!==e.attributes&&"core/audio"===t&&(e.attributes=Object.assign(e.attributes,{mediaURL:{type:"string",default:""},mediaTitle:{type:"string",default:""},mediaArtist:{type:"string",default:""},mediaAlbum:{type:"string",default:""},poster:{type:"object",default:{}}})),e))),(0,d.addFilter)("editor.BlockEdit","tumblr3/extend-audio-block",(0,s.createHigherOrderComponent)((t=>c=>{const{attributes:a,setAttributes:l,isSelected:r}=c,{src:n,mediaURL:d,mediaTitle:s,mediaArtist:m,mediaAlbum:u,poster:h}=a;return n&&n!==d&&l({mediaURL:n}),(0,e.createElement)(e.Fragment,null,(0,e.createElement)(t,{...c}),r&&"core/audio"===c.name&&(0,e.createElement)(i.InspectorControls,null,(0,e.createElement)(o.PanelBody,{title:"Media Information",initialOpen:!0},(0,e.createElement)(o.TextControl,{label:"Media Title",value:s,onChange:e=>l({mediaTitle:e})}),(0,e.createElement)(o.TextControl,{label:"Media Artist",value:m,onChange:e=>l({mediaArtist:e})}),(0,e.createElement)(o.TextControl,{label:"Media Album",value:u,onChange:e=>l({mediaAlbum:e})}),(0,e.createElement)(i.MediaUploadCheck,null,(0,e.createElement)(i.MediaUpload,{onSelect:e=>l({poster:{url:e.url,alt:e.alt}}),allowedTypes:["image"],render:({open:t})=>(0,e.createElement)(o.Button,{onClick:t,variant:"secondary"},h.url?"Replace Poster Image":"Upload Poster Image")}),h.url&&(0,e.createElement)("div",null,(0,e.createElement)("img",{src:h.url,alt:h.alt||"Poster Image",style:{maxWidth:"100%"}}),(0,e.createElement)(o.Button,{isDestructive:!0,onClick:()=>l({poster:{}})},"Remove Poster Image"))))))}),"enhanced-audio-block"))})(); \ No newline at end of file diff --git a/assets/js/build/theme-garden.asset.php b/assets/js/build/theme-garden.asset.php index de61e68..0002073 100644 --- a/assets/js/build/theme-garden.asset.php +++ b/assets/js/build/theme-garden.asset.php @@ -1,4 +1 @@ - array(), - 'version' => 'bee837eb4a53a080e012', -); + array(), 'version' => 'bee837eb4a53a080e012'); diff --git a/assets/js/build/theme-install.asset.php b/assets/js/build/theme-install.asset.php index d4e5b22..d9d7ec3 100644 --- a/assets/js/build/theme-install.asset.php +++ b/assets/js/build/theme-install.asset.php @@ -1,4 +1 @@ - array(), - 'version' => '3145422ea2aa5e4a5ad2', -); + array(), 'version' => '3145422ea2aa5e4a5ad2'); diff --git a/assets/js/src/components/audio-block.js b/assets/js/src/components/audio-block.js new file mode 100644 index 0000000..1cd2715 --- /dev/null +++ b/assets/js/src/components/audio-block.js @@ -0,0 +1,107 @@ +import { InspectorControls, MediaUpload, MediaUploadCheck } from '@wordpress/block-editor'; +import { PanelBody, TextControl, Button } from '@wordpress/components'; +import { addFilter } from '@wordpress/hooks'; +import { createHigherOrderComponent } from '@wordpress/compose'; + +/** + * Register new attributes for the audio block. + */ +addFilter( 'blocks.registerBlockType', 'tumblr3/extend-audio-block', ( settings, name ) => { + if ( typeof settings.attributes !== 'undefined' && name === 'core/audio' ) { + settings.attributes = Object.assign( settings.attributes, { + mediaURL: { + type: 'string', + default: '', + }, + mediaTitle: { + type: 'string', + default: '', + }, + mediaArtist: { + type: 'string', + default: '', + }, + mediaAlbum: { + type: 'string', + default: '', + }, + poster: { + type: 'object', + default: {}, + }, + } ); + } + + return settings; +} ); + +/** + * Extend the audio block with sidebar controls. + */ +addFilter( + 'editor.BlockEdit', + 'tumblr3/extend-audio-block', + createHigherOrderComponent( BlockEdit => { + return props => { + const { attributes, setAttributes, isSelected } = props; + const { src, mediaURL, mediaTitle, mediaArtist, mediaAlbum, poster } = attributes; + + // Sync mediaURL with src if they differ + if ( src && src !== mediaURL ) { + setAttributes( { mediaURL: src } ); + } + + return ( + <> + + { isSelected && props.name === 'core/audio' && ( + + + setAttributes( { mediaTitle: value } ) } + /> + setAttributes( { mediaArtist: value } ) } + /> + setAttributes( { mediaAlbum: value } ) } + /> + + + setAttributes( { poster: { url: media.url, alt: media.alt } } ) + } + allowedTypes={ [ 'image' ] } + render={ ( { open } ) => ( + + ) } + /> + { poster.url && ( +
+ { + +
+ ) } + + + + ) } + + ); + }; + }, 'enhanced-audio-block' ) +); diff --git a/assets/js/src/components/post-formats.js b/assets/js/src/components/post-formats.js new file mode 100644 index 0000000..ed09bbf --- /dev/null +++ b/assets/js/src/components/post-formats.js @@ -0,0 +1,231 @@ +/* eslint-disable react-hooks/rules-of-hooks */ +import { registerPlugin } from '@wordpress/plugins'; +import { PluginPostStatusInfo } from '@wordpress/editor'; +import { __, sprintf } from '@wordpress/i18n'; +import { useDispatch, useSelect, dispatch } from '@wordpress/data'; +import { Button } from '@wordpress/components'; +import { store as blockEditorStore } from '@wordpress/block-editor'; +import { createBlock } from '@wordpress/blocks'; + +/** + * @see https://github.com/WordPress/gutenberg/blob/dd7451ff41acae3c2e9fa56b6ed7a1f14db04a55/packages/editor/src/components/post-format/index.js#L83 + */ +const POST_FORMATS = [ + { + id: 'standard', + caption: __( 'Text' ), + icon: ( + + + + ), + }, + { + id: 'image', + caption: __( 'Image' ), + icon: ( + + + + ), + }, + { + id: 'gallery', + caption: __( 'Gallery' ), + icon: ( + + + + ), + }, + { + id: 'quote', + caption: __( 'Quote' ), + icon: ( + + + + ), + }, + { + id: 'link', + caption: __( 'Link' ), + icon: ( + + + + ), + }, + { + id: 'chat', + caption: __( 'Chat' ), + icon: ( + + + + ), + }, + { + id: 'audio', + caption: __( 'Audio' ), + icon: ( + + + + ), + }, + { + id: 'video', + caption: __( 'Video' ), + icon: ( + + + + ), + }, +]; + +registerPlugin( 'tumblr3-updated-postformat-ui', { + render: () => { + // Create a suggestion for the post format based on the blocks in the content. + const createSuggestion = blocks => { + if ( blocks.length > 2 ) { + return null; + } + + let name; + + // If there is only one block in the content of the post grab its name + // so we can derive a suitable post format from it. + if ( blocks.length === 1 ) { + name = blocks[ 0 ].name; + // Check for core/embed `video` and `audio` eligible suggestions. + if ( name === 'core/embed' ) { + const provider = blocks[ 0 ].attributes?.providerNameSlug; + if ( [ 'youtube', 'vimeo' ].includes( provider ) ) { + name = 'core/video'; + } else if ( [ 'spotify', 'soundcloud' ].includes( provider ) ) { + name = 'core/audio'; + } + } + } + + // If there are two blocks in the content and the last one is a text blocks + // grab the name of the first one to also suggest a post format from it. + if ( blocks.length === 2 && blocks[ 1 ].name === 'core/paragraph' ) { + name = blocks[ 0 ].name; + } + + // We only convert to default post formats in core. + switch ( name ) { + case 'core/image': + return 'image'; + case 'core/quote': + case 'core/pullquote': + return 'quote'; + case 'core/gallery': + return 'gallery'; + case 'core/video': + return 'video'; + case 'core/audio': + return 'audio'; + default: + return null; + } + }; + + // Get the `editPost` action from the `core/editor` store. + const { editPost } = useDispatch( 'core/editor' ); + + // Get the current post format from the store. + const activeFormat = useSelect( + select => select( 'core/editor' ).getEditedPostAttribute( 'format' ), + [] + ); + + const blocks = useSelect( select => select( blockEditorStore ).getBlocks(), [] ); + + // Get the suggestion for the post format. + const suggestion = createSuggestion( blocks ); + + // Update the post format. + const updatePostFormat = id => { + editPost( { format: id } ); + + // Finish early if there are already blocks in the content. + if ( blocks.length > 1 ) { + return; + } + + // Finish early if there is only one block in the content and it is not a paragraph. + if ( blocks.length === 1 && blocks[ 0 ].name !== 'core/paragraph' ) { + return; + } + + // Insert block format based on the selected post format. + switch ( id ) { + case 'image': + dispatch( 'core/block-editor' ).insertBlocks( createBlock( 'core/image' ), 0 ); + break; + case 'quote': + dispatch( 'core/block-editor' ).insertBlocks( createBlock( 'core/quote' ), 0 ); + break; + case 'gallery': + dispatch( 'core/block-editor' ).insertBlocks( createBlock( 'core/gallery' ), 0 ); + break; + case 'video': + dispatch( 'core/block-editor' ).insertBlocks( createBlock( 'core/video' ), 0 ); + break; + case 'audio': + dispatch( 'core/block-editor' ).insertBlocks( createBlock( 'core/audio' ), 0 ); + break; + default: + break; + } + }; + + return ( + +
+

+ { __( 'Post Formats', 'tumblr3' ) } +

+ + { POST_FORMATS.map( ( { id, caption, icon } ) => ( + + ) ) } + + + { suggestion && suggestion !== activeFormat && ( +

+ +

+ ) } +
+ + ); + }, +} ); diff --git a/assets/js/src/editor.js b/assets/js/src/editor.js index 96aa8aa..2d6be36 100644 --- a/assets/js/src/editor.js +++ b/assets/js/src/editor.js @@ -1,266 +1,4 @@ /* eslint-disable react-hooks/rules-of-hooks */ - -import { registerPlugin } from '@wordpress/plugins'; -import { PluginPostStatusInfo } from '@wordpress/editor'; -import { __, sprintf } from '@wordpress/i18n'; -import { useDispatch, useSelect, dispatch } from '@wordpress/data'; -import { Button } from '@wordpress/components'; -import { store as blockEditorStore } from '@wordpress/block-editor'; -import { createBlock } from '@wordpress/blocks'; - import './index.scss'; - -/** - * @see https://github.com/WordPress/gutenberg/blob/dd7451ff41acae3c2e9fa56b6ed7a1f14db04a55/packages/editor/src/components/post-format/index.js#L83 - */ -const POST_FORMATS = [ - { - id: 'standard', - caption: __( 'Text' ), - icon: ( - - - - ), - }, - { - id: 'image', - caption: __( 'Image' ), - icon: ( - - - - ), - }, - { - id: 'gallery', - caption: __( 'Gallery' ), - icon: ( - - - - ), - }, - { - id: 'quote', - caption: __( 'Quote' ), - icon: ( - - - - ), - }, - { - id: 'link', - caption: __( 'Link' ), - icon: ( - - - - ), - }, - { - id: 'chat', - caption: __( 'Chat' ), - icon: ( - - - - ), - }, - { - id: 'audio', - caption: __( 'Audio' ), - icon: ( - - - - ), - }, - { - id: 'video', - caption: __( 'Video' ), - icon: ( - - - - ), - }, -]; - -registerPlugin( 'tumblr3-updated-postformat-ui', { - render: () => { - // Create a suggestion for the post format based on the blocks in the content. - const createSuggestion = ( blocks ) => { - if ( blocks.length > 2 ) { - return null; - } - - let name; - - // If there is only one block in the content of the post grab its name - // so we can derive a suitable post format from it. - if ( blocks.length === 1 ) { - name = blocks[ 0 ].name; - // Check for core/embed `video` and `audio` eligible suggestions. - if ( name === 'core/embed' ) { - const provider = blocks[ 0 ].attributes?.providerNameSlug; - if ( [ 'youtube', 'vimeo' ].includes( provider ) ) { - name = 'core/video'; - } else if ( - [ 'spotify', 'soundcloud' ].includes( provider ) - ) { - name = 'core/audio'; - } - } - } - - // If there are two blocks in the content and the last one is a text blocks - // grab the name of the first one to also suggest a post format from it. - if ( - blocks.length === 2 && - blocks[ 1 ].name === 'core/paragraph' - ) { - name = blocks[ 0 ].name; - } - - // We only convert to default post formats in core. - switch ( name ) { - case 'core/image': - return 'image'; - case 'core/quote': - case 'core/pullquote': - return 'quote'; - case 'core/gallery': - return 'gallery'; - case 'core/video': - return 'video'; - case 'core/audio': - return 'audio'; - default: - return null; - } - }; - - // Get the `editPost` action from the `core/editor` store. - const { editPost } = useDispatch( 'core/editor' ); - - // Get the current post format from the store. - const activeFormat = useSelect( - ( select ) => - select( 'core/editor' ).getEditedPostAttribute( 'format' ), - [] - ); - - const blocks = useSelect( - ( select ) => select( blockEditorStore ).getBlocks(), - [] - ); - - // Get the suggestion for the post format. - const suggestion = createSuggestion( blocks ); - - // Update the post format. - const updatePostFormat = ( id ) => { - editPost( { format: id } ); - - // Finish early if there are already blocks in the content. - if ( blocks.length > 1 ) { - return; - } - - // Finish early if there is only one block in the content and it is not a paragraph. - if ( - blocks.length === 1 && - blocks[ 0 ].name !== 'core/paragraph' - ) { - return; - } - - // Insert block format based on the selected post format. - switch ( id ) { - case 'image': - dispatch( 'core/block-editor' ).insertBlocks( - createBlock( 'core/image' ), - 0 - ); - break; - case 'quote': - dispatch( 'core/block-editor' ).insertBlocks( - createBlock( 'core/quote' ), - 0 - ); - break; - case 'gallery': - dispatch( 'core/block-editor' ).insertBlocks( - createBlock( 'core/gallery' ), - 0 - ); - break; - case 'video': - dispatch( 'core/block-editor' ).insertBlocks( - createBlock( 'core/video' ), - 0 - ); - break; - case 'audio': - dispatch( 'core/block-editor' ).insertBlocks( - createBlock( 'core/audio' ), - 0 - ); - break; - default: - break; - } - }; - - return ( - -
-

- { __( 'Post Formats', 'tumblr3' ) } -

- - { POST_FORMATS.map( ( { id, caption, icon } ) => ( - - ) ) } - - - { suggestion && suggestion !== activeFormat && ( -

- -

- ) } -
- - ); - }, -} ); +import './components/post-formats'; +import './components/audio-block'; diff --git a/assets/js/src/theme-garden.js b/assets/js/src/theme-garden.js index 0746bf3..040af67 100644 --- a/assets/js/src/theme-garden.js +++ b/assets/js/src/theme-garden.js @@ -2,9 +2,7 @@ window.addEventListener( 'DOMContentLoaded', function () { const categorySelect = document.getElementById( 't3-categories' ); - const categorySelectForm = document.getElementById( - 't3-category-select-form' - ); + const categorySelectForm = document.getElementById( 't3-category-select-form' ); categorySelect.addEventListener( 'change', function () { categorySelectForm.submit(); diff --git a/assets/js/src/theme-install.js b/assets/js/src/theme-install.js index 849fe2c..3acdd75 100644 --- a/assets/js/src/theme-install.js +++ b/assets/js/src/theme-install.js @@ -9,10 +9,7 @@ window.addEventListener( window.location = T3_Install.browseUrl; }; - if ( - filterLinks[ 0 ] && - filterLinks[ 0 ].tagName.toLowerCase() === 'ul' - ) { + if ( filterLinks[ 0 ] && filterLinks[ 0 ].tagName.toLowerCase() === 'ul' ) { const list = filterLinks[ 0 ]; const listItem = document.createElement( 'li' ); const link = document.createElement( 'button' ); diff --git a/composer.json b/composer.json index cc6ecdf..4ba32b7 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "phpunit": "vendor/bin/phpunit", "generate-autoloader": "@composer dump-autoload -o", "format:php": "phpcbf --standard=./.phpcs.xml --basepath=. --extensions=php . -v", - "lint:php": "phpcs --standard=./.phpcs.xml --basepath=. --extensions=php . -v", + "lint:php": "phpcs --standard=./.phpcs.xml --basepath=. --extensions=php . -v -s", "internationalize": [ "@makepot", "@updatepo", diff --git a/composer.lock b/composer.lock index dcb1e74..d36c212 100644 --- a/composer.lock +++ b/composer.lock @@ -2496,12 +2496,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "e63317470a1b96346be224a68f9e64567e1001c3" + "reference": "7643106bdba2fda72ee6f586a74a231155901935" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e63317470a1b96346be224a68f9e64567e1001c3", - "reference": "e63317470a1b96346be224a68f9e64567e1001c3", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/7643106bdba2fda72ee6f586a74a231155901935", + "reference": "7643106bdba2fda72ee6f586a74a231155901935", "shasum": "" }, "conflict": { @@ -2820,7 +2820,7 @@ "lara-zeus/artemis": ">=1,<=1.0.6", "lara-zeus/dynamic-dashboard": ">=3,<=3.0.1", "laravel/fortify": "<1.11.1", - "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75", + "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31", "laravel/laravel": ">=5.4,<5.4.22", "laravel/reverb": "<1.4", "laravel/socialite": ">=1,<2.0.10", @@ -2878,7 +2878,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.3.6|>=4.4.0.0-beta,<4.4.2", + "moodle/moodle": "<4.3.6|>=4.4,<4.4.2", "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "movingbytes/social-network": "<=1.2.1", @@ -2926,7 +2926,7 @@ "openmage/magento-lts": "<20.10.1", "opensolutions/vimbadmin": "<=3.0.15", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", - "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", + "orchid/platform": ">=8,<14.43", "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", @@ -3329,7 +3329,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T19:04:57+00:00" + "time": "2024-11-12T23:05:16+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/includes/block-functions.php b/includes/block-functions.php index 3b5ae6b..094fd56 100644 --- a/includes/block-functions.php +++ b/includes/block-functions.php @@ -971,8 +971,10 @@ function tumblr3_block_audio( $atts, $content = '' ): string { // Stop on the first audio block. if ( 'core/audio' === $block['blockName'] ) { - $media_id = isset( $block['attrs']['id'] ) ? $block['attrs']['id'] : 0; - + $media_id = isset( $block['attrs']['id'] ) ? $block['attrs']['id'] : 0; + $trackname = isset( $block['attrs']['mediaTitle'] ) ? $block['attrs']['mediaTitle'] : ''; + $artist = isset( $block['attrs']['mediaArtist'] ) ? $block['attrs']['mediaArtist'] : ''; + $album = isset( $block['attrs']['mediaAlbum'] ) ? $block['attrs']['mediaAlbum'] : ''; $processor = new CupcakeLabs\T3\Processor( $block['innerHTML'] ); // Set bookmarks to extract HTML positions. @@ -1004,12 +1006,12 @@ function tumblr3_block_audio( $atts, $content = '' ): string { } } - // Extract metadata from the media ID. - if ( is_int( $media_id ) ) { + // Extract metadata from the media ID, don't overwrite values if they're already set. + if ( is_int( $media_id ) && $media_id > 0 ) { $meta = wp_get_attachment_metadata( $media_id ); - $trackname = isset( $meta['title'] ) ? $meta['title'] : ''; - $artist = isset( $meta['artist'] ) ? $meta['artist'] : ''; - $album = isset( $meta['album'] ) ? $meta['album'] : ''; + $trackname = ( empty( $trackname ) && isset( $meta['title'] ) ) ? $meta['title'] : $trackname; + $artist = ( empty( $artist ) && isset( $meta['artist'] ) ) ? $meta['artist'] : $artist; + $album = ( empty( $album ) && isset( $meta['album'] ) ) ? $meta['album'] : $album; } // Set the current context. diff --git a/tumblr-theme-translator.php b/tumblr-theme-translator.php index 3c58315..a9e2361 100644 --- a/tumblr-theme-translator.php +++ b/tumblr-theme-translator.php @@ -6,6 +6,7 @@ * @version 1.0.0 * @author Cupcake Labs * @license GPL-3.0-or-later + * @package Tumblr3 * * @noinspection ALL *