Skip to content
Merged

Release #1181

Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion bin/run-e2e-tests-gutenberg-datatable.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
docker-compose -f $DOCKER_FILE run --rm -u root cli bash -c "wp --allow-root plugin deactivate classic-editor"
docker compose -f $DOCKER_FILE run --rm -u root cli bash -c "wp --allow-root plugin deactivate classic-editor"



Expand Down
2 changes: 1 addition & 1 deletion bin/run-e2e-tests-gutenberg.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
docker-compose -f $DOCKER_FILE run --rm -u root cli bash -c "wp --allow-root plugin deactivate classic-editor"
docker compose -f $DOCKER_FILE run --rm -u root cli bash -c "wp --allow-root plugin deactivate classic-editor"
2 changes: 1 addition & 1 deletion bin/wp-down.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
docker-compose -f $DOCKER_FILE down
docker compose -f $DOCKER_FILE down
docker volume prune --force
9 changes: 3 additions & 6 deletions bin/wp-init.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#!/usr/bin/env bash

docker-compose -f $DOCKER_FILE up -d
docker compose -f $DOCKER_FILE up -d
# Wait for mysql container to be ready.
while docker-compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root db check ; [ $? -ne 0 ]; do
while docker compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root db check ; [ $? -ne 0 ]; do
echo "Waiting for db to be ready... "
sleep 1
done
# install WP
docker-compose -f $DOCKER_FILE run --rm -u root cli bash -c "/var/www/html/bin/cli-setup.sh"



docker compose -f $DOCKER_FILE run --rm -u root cli bash -c "/var/www/html/bin/cli-setup.sh"
4 changes: 2 additions & 2 deletions classes/Visualizer/Gutenberg/build/block.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion classes/Visualizer/Gutenberg/src/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ class Editor extends Component {
window.parent.addEventListener( 'message', ( event ) => {
if ( 'visualizer:mediaframe:close' === event.data ) {
createChartPopup.close();
} else if ( event.data.chartID ) {
} else if ( event.data.chartID && null === this.state.chart ) {
const chartID = parseInt( event.data.chartID, 10 );
this.getChart( chartID );
}
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

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

Loading