-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #431 from InfoAmazonia/release/2.10.0
Release 2.10.0
- Loading branch information
Showing
15 changed files
with
430 additions
and
305 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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 |
|---|---|---|
| @@ -1,43 +1,36 @@ | ||
| // import { select } from '@wordpress/data'; | ||
| import domReady from '@wordpress/dom-ready'; | ||
| import { useSelect, AsyncModeProvider } from '@wordpress/data'; | ||
| import domReady from '@wordpress/dom-ready'; | ||
| import { registerPlugin } from '@wordpress/plugins'; | ||
|
|
||
| import MapsSidebar from './maps-sidebar'; | ||
|
|
||
| import StoryMapSidebar from './storymap-sidebar'; | ||
|
|
||
| domReady( () => { | ||
| registerPlugin( 'jeo-maps-sidebar', { | ||
| icon: null, | ||
| render: () => { | ||
| const currentPostType = useSelect( ( select ) => { | ||
| return select( 'core/editor' ).getCurrentPostType() | ||
| }, [] ); | ||
|
|
||
| const postTitleElement = document.querySelector('.editor-post-title'); | ||
|
|
||
| if(!postTitleElement) { | ||
| return null; | ||
| } | ||
|
|
||
| if(currentPostType === "map") { | ||
| const preview = document.createElement('div'); | ||
| preview.setAttribute('id', 'map-preview'); | ||
| postTitleElement.parentNode.appendChild(preview); | ||
| } | ||
|
|
||
| return ( | ||
| <AsyncModeProvider value={ true }> | ||
| { currentPostType === "map"? <MapsSidebar /> : null }; | ||
| { currentPostType === "storymap"? <StoryMapSidebar /> : null }; | ||
| </AsyncModeProvider> | ||
| ) | ||
|
|
||
| }, | ||
| } ); | ||
|
|
||
| // } | ||
|
|
||
|
|
||
| } ); | ||
| import { waitUntil } from '../shared/wait'; | ||
|
|
||
| domReady(() => { | ||
| waitUntil( | ||
| () => document.querySelector( '.editor-post-title' ), | ||
| ( postTitleElement ) => { | ||
| registerPlugin( 'jeo-maps-sidebar', { | ||
| icon: null, | ||
| render: () => { | ||
| const currentPostType = useSelect( ( select ) => { | ||
| return select( 'core/editor' ).getCurrentPostType(); | ||
| }, [] ); | ||
|
|
||
| if (currentPostType === "map") { | ||
| const preview = document.createElement('div'); | ||
| preview.setAttribute('id', 'map-preview'); | ||
| postTitleElement.parentNode.appendChild(preview); | ||
| } | ||
|
|
||
| return ( | ||
| <AsyncModeProvider value={ true }> | ||
| { currentPostType === "map"? <MapsSidebar /> : null }; | ||
| { currentPostType === "storymap"? <StoryMapSidebar /> : null }; | ||
| </AsyncModeProvider> | ||
| ); | ||
| }, | ||
| } ); | ||
| } | ||
| ); | ||
| }); |
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| export function waitUntil ( condition, callback, intervalMs = 50, timeoutMs = 30_000 ) { | ||
| const initialValue = condition(); | ||
| if ( initialValue ) { | ||
| return callback( initialValue ); | ||
| } | ||
|
|
||
| let elapsed = 0; | ||
| let interval = window.setInterval( () => { | ||
| const value = condition(); | ||
| if ( value ) { | ||
| callback( value ); | ||
| return window.clearInterval( interval ); | ||
| } | ||
|
|
||
| elapsed += intervalMs; | ||
| if ( elapsed >= timeoutMs ) { | ||
| window.clearInterval( interval ); | ||
| } | ||
| }, intervalMs ); | ||
| } |
Oops, something went wrong.