-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove confusing # from meta-data block, prepend mailto on mail addre…
…sses (#677)
- Loading branch information
Showing
5 changed files
with
65 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| }, | ||
| "url": { | ||
| "type": "string", | ||
| "default": "#" | ||
| "default": "" | ||
| } | ||
| }, | ||
| "supports": { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,8 +56,19 @@ export default function Edit( { attributes, setAttributes } ) { | |
| setAttributes( { icon: newIcon === undefined ? 'none' : newIcon } ); | ||
| }; | ||
|
|
||
| function validateEmail( email ) { | ||
| const re = /^[^\s@\/]+@[^\s@]+\.[^\s@]{2,10}$/; | ||
| return re.test( email ); | ||
| } | ||
|
|
||
| const onChangeUrl = ( newUrl ) => { | ||
| setAttributes( { url: newUrl === undefined ? '#' : newUrl } ); | ||
| if ( | ||
| validateEmail( newUrl ) && | ||
| ! ( newUrl.substring( 0, 7 ) === 'mailto:' ) | ||
| ) { | ||
| newUrl = 'mailto:' + newUrl; | ||
| } | ||
| setAttributes( { url: newUrl === undefined ? '' : newUrl } ); | ||
| }; | ||
|
|
||
| return ( | ||
|
|
@@ -140,10 +151,11 @@ export default function Edit( { attributes, setAttributes } ) { | |
| <TextControl | ||
| label="URL" | ||
| help={ __( | ||
| 'Target URL the Icon is linked to', | ||
| 'Target URL the Icon is linked to. For email addresses, use the format mailto:[email protected].', | ||
| 'sunflower-meta-data' | ||
| ) } | ||
| value={ url } | ||
| placeholder={ 'https://gruene.social/@verdigado' } | ||
| onChange={ onChangeUrl } | ||
| /> | ||
| </PanelBody> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,4 +18,9 @@ | |
|
|
||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| .d-flex:has(.wp-block-sunflower-meta-data) { | ||
| display: flex !important; | ||
| } | ||