From 1d424255def9f987c4e780ee390c6083063d098a Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 13 Feb 2024 16:00:27 +0000 Subject: [PATCH 01/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 76a55b3290..6c8d50e85c 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 76a55b3290233c809eb3094f838a6cf8478f940d +Subproject commit 6c8d50e85c706cb0d67e2ba9fdaa5d1a50bf12cf From 0a56e6adddfbc17f53b07f8ce5c4d113b44f1ce3 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 13 Feb 2024 17:13:40 +0000 Subject: [PATCH 02/19] Update with bundle changes --- bundle/android/strings.xml | 10 +++++++++- bundle/ios/GutenbergNativeTranslations.swift | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml index 67a72b61f0..b23d26f3e1 100644 --- a/bundle/android/strings.xml +++ b/bundle/android/strings.xml @@ -48,6 +48,8 @@ audio file Audio Player + Auto + Autoplay may cause usability issues for some users Block cannot be rendered because it is deeply nested. Tap here for more details. Block copied @@ -160,6 +162,7 @@ Edit media Edit using web editor Edit video + Edit video Editing synced patterns is not yet supported on %s for Android @@ -290,7 +293,9 @@ translators: %s: Select control button label e.g. "Button width" --> Page title. %s Paste block after Paste URL + Play inline Playback Bar Color + Playback controls Playback Settings Post title. Empty @@ -389,10 +394,13 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Upgrade your plan to use video covers Uploading… Use icon button - Video caption. Empty + + Video caption. Empty Video caption. %s + + Video caption. %s Waiting for connection Warning message We are working hard to add more blocks with each release. diff --git a/bundle/ios/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift index 8ac86e4842..e3cf1b1d72 100644 --- a/bundle/ios/GutenbergNativeTranslations.swift +++ b/bundle/ios/GutenbergNativeTranslations.swift @@ -54,6 +54,8 @@ private func dummy() { _ = NSLocalizedString("Audio caption. Empty", comment: "translators: accessibility text. Empty Audio caption.") _ = NSLocalizedString("audio file", comment: "translators: displays audio file extension. e.g. MP3 audio file") _ = NSLocalizedString("Audio Player", comment: "") + _ = NSLocalizedString("Auto", comment: "") + _ = NSLocalizedString("Autoplay may cause usability issues for some users", comment: "") _ = NSLocalizedString("Block cannot be rendered because it is deeply nested. Tap here for more details.", comment: "") _ = NSLocalizedString("Block copied", comment: "translators: displayed right after the block is copied.") _ = NSLocalizedString("Block cut", comment: "translators: displayed right after the block is cut.") @@ -261,7 +263,9 @@ private func dummy() { _ = NSLocalizedString("Page title. Empty", comment: "translators: accessibility text. empty page title.") _ = NSLocalizedString("Paste block after", comment: "") _ = NSLocalizedString("Paste URL", comment: "") + _ = NSLocalizedString("Play inline", comment: "") _ = NSLocalizedString("Playback Bar Color", comment: "") + _ = NSLocalizedString("Playback controls", comment: "") _ = NSLocalizedString("Playback Settings", comment: "") _ = NSLocalizedString("Post title. %s", comment: "translators: accessibility text. %s: text content of the post title.") _ = NSLocalizedString("Post title. Empty", comment: "translators: accessibility text. empty post title.") From b0278b6b5a90f03b54bb3af52645570b72d87290 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 13 Feb 2024 20:58:53 +0000 Subject: [PATCH 03/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 6c8d50e85c..87db30a005 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 6c8d50e85c706cb0d67e2ba9fdaa5d1a50bf12cf +Subproject commit 87db30a005d877533f5969e2b6116d0764297f02 From 37609f013ee27af3bc453507d041b7eb71d6c131 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 13 Feb 2024 22:54:43 +0000 Subject: [PATCH 04/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 87db30a005..a5d7df8438 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 87db30a005d877533f5969e2b6116d0764297f02 +Subproject commit a5d7df8438fb6241e14b3392ffe1d3bea7e080df From 139d90e84fa547966900be740617b771a510a531 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 14 Feb 2024 14:27:18 +0000 Subject: [PATCH 05/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index a5d7df8438..1aa07e559e 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit a5d7df8438fb6241e14b3392ffe1d3bea7e080df +Subproject commit 1aa07e559e325882f78d999f30a74a2da1279a44 From 9485b3bea406f001669cc820d07eb6bb6060a333 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 14 Feb 2024 14:33:07 +0000 Subject: [PATCH 06/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 1aa07e559e..1b98f618c4 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 1aa07e559e325882f78d999f30a74a2da1279a44 +Subproject commit 1b98f618c42d9136a4e49a434f90fb5751a0d270 From a837182584d41f46fdfebd4f1648090fcfa7b459 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 16 Feb 2024 11:10:10 +0000 Subject: [PATCH 07/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 1b98f618c4..85a30acab5 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 1b98f618c42d9136a4e49a434f90fb5751a0d270 +Subproject commit 85a30acab5f76b33b0e3a537b479e7edbb91335b From ce21e694ffb1fd71ae6bca13b8a8ee62f7c03728 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 10:57:58 +0000 Subject: [PATCH 08/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 85a30acab5..11a8a8a4e4 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 85a30acab5f76b33b0e3a537b479e7edbb91335b +Subproject commit 11a8a8a4e447006fe0c420dc1a4a6a80c0455c6e From 4369bc9f1e0111d82f5eedf92b1c3b3726cfea07 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 12:32:35 +0000 Subject: [PATCH 09/19] fix: Limit VideoPress v5 to supported sites --- src/jetpack-editor-setup.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index ff9f9cd262..b2c75e2b89 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -17,7 +17,6 @@ import { registerLoomVariation, registerSmartframeVariation, } from '../jetpack/projects/plugins/jetpack/extensions/extended-blocks/core-embed'; -import '../jetpack/projects/plugins/jetpack/extensions/blocks/videopress/editor'; // When adding new blocks to this list please also consider updating `./block-support/supported-blocks.json` const supportedJetpackBlocks = { @@ -129,6 +128,14 @@ export function registerJetpackEmbedVariations( { capabilities } ) { } ); } +export function enableVideoPressV5Support( { capabilities } ) { + if ( ! isActive() || ! capabilities.videoPressBlock ) { + return; + } + + require( '../jetpack/projects/plugins/jetpack/extensions/blocks/videopress/editor' ); +} + const setupHooks = () => { // Hook triggered before the editor is rendered addAction( 'native.pre-render', 'gutenberg-mobile-jetpack', ( props ) => { @@ -142,6 +149,11 @@ const setupHooks = () => { // block type registration, so it’s required to add them before // the core blocks are registered. registerJetpackEmbedVariations( props ); + + // VideoPress v5 conversion also uses WP hooks that are attached to + // block type registration, so it’s required to add them before + // the core blocks are registered. + enableVideoPressV5Support( props ); } ); // Hook triggered after the editor is rendered From c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 12:41:04 +0000 Subject: [PATCH 10/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 11a8a8a4e4..6c5e18bc90 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 11a8a8a4e447006fe0c420dc1a4a6a80c0455c6e +Subproject commit 6c5e18bc9043a8d38fe7f5b7113eb38f15d3da87 From 3479eea6808ee488ae8116157bb5c361096936c8 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 16:26:47 +0000 Subject: [PATCH 11/19] refactor: Be more specific with capability --- src/jetpack-editor-setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js index b2c75e2b89..edda77d5a7 100644 --- a/src/jetpack-editor-setup.js +++ b/src/jetpack-editor-setup.js @@ -129,7 +129,7 @@ export function registerJetpackEmbedVariations( { capabilities } ) { } export function enableVideoPressV5Support( { capabilities } ) { - if ( ! isActive() || ! capabilities.videoPressBlock ) { + if ( ! isActive() || ! capabilities.videoPressV5Support ) { return; } From 897f363e6c8c7d81bc7c33dd140b787c6411946a Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 16:27:15 +0000 Subject: [PATCH 12/19] Update Gutenberg reference --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index b21b88dfe4..112c325a8a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit b21b88dfe4a95222b9f64e0a665cdba34fce778d +Subproject commit 112c325a8a0094871db8650f47b6463718538619 From d521cb21305c4d34723a58b336230961c19f6d27 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 20 Feb 2024 23:35:46 +0000 Subject: [PATCH 13/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index 6c5e18bc90..ae25e26368 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit 6c5e18bc9043a8d38fe7f5b7113eb38f15d3da87 +Subproject commit ae25e26368ab6ed4473ea072b82ab59814704d69 From 8a55c0aba637f8069341c9362fd2276472d01dc3 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 20 Feb 2024 23:48:08 +0000 Subject: [PATCH 14/19] Update RELEASE-NOTES --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 33d9ec9991..bf8218f6ee 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,6 @@ Unreleased --- +* [**] Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634] 1.112.0 --- From 049f383c6f226d1a35b8c9f24f4fbf91f7455115 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 23 Feb 2024 15:54:33 +0100 Subject: [PATCH 15/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index ae25e26368..f1ae7fb120 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit ae25e26368ab6ed4473ea072b82ab59814704d69 +Subproject commit f1ae7fb120221b3c678e11f4008149ab04abf289 From bc69c528b12778745533d0e4c477331c1c03e94c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 23 Feb 2024 15:54:42 +0100 Subject: [PATCH 16/19] Update localization strings files --- bundle/android/strings.xml | 3 --- bundle/ios/GutenbergNativeTranslations.swift | 3 --- 2 files changed, 6 deletions(-) diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml index b23d26f3e1..bc92b80078 100644 --- a/bundle/android/strings.xml +++ b/bundle/android/strings.xml @@ -48,7 +48,6 @@ audio file Audio Player - Auto Autoplay may cause usability issues for some users Block cannot be rendered because it is deeply nested. Tap here for more details. @@ -293,9 +292,7 @@ translators: %s: Select control button label e.g. "Button width" --> Page title. %s Paste block after Paste URL - Play inline Playback Bar Color - Playback controls Playback Settings Post title. Empty diff --git a/bundle/ios/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift index e3cf1b1d72..f702168650 100644 --- a/bundle/ios/GutenbergNativeTranslations.swift +++ b/bundle/ios/GutenbergNativeTranslations.swift @@ -54,7 +54,6 @@ private func dummy() { _ = NSLocalizedString("Audio caption. Empty", comment: "translators: accessibility text. Empty Audio caption.") _ = NSLocalizedString("audio file", comment: "translators: displays audio file extension. e.g. MP3 audio file") _ = NSLocalizedString("Audio Player", comment: "") - _ = NSLocalizedString("Auto", comment: "") _ = NSLocalizedString("Autoplay may cause usability issues for some users", comment: "") _ = NSLocalizedString("Block cannot be rendered because it is deeply nested. Tap here for more details.", comment: "") _ = NSLocalizedString("Block copied", comment: "translators: displayed right after the block is copied.") @@ -263,9 +262,7 @@ private func dummy() { _ = NSLocalizedString("Page title. Empty", comment: "translators: accessibility text. empty page title.") _ = NSLocalizedString("Paste block after", comment: "") _ = NSLocalizedString("Paste URL", comment: "") - _ = NSLocalizedString("Play inline", comment: "") _ = NSLocalizedString("Playback Bar Color", comment: "") - _ = NSLocalizedString("Playback controls", comment: "") _ = NSLocalizedString("Playback Settings", comment: "") _ = NSLocalizedString("Post title. %s", comment: "translators: accessibility text. %s: text content of the post title.") _ = NSLocalizedString("Post title. Empty", comment: "translators: accessibility text. empty post title.") From 393ad237c1006935ddf7bd606fa49a412605f398 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 23 Feb 2024 16:51:14 +0000 Subject: [PATCH 17/19] Fix duplicated release note --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 14b8c75464..2c4633641d 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,7 +1,6 @@ Unreleased --- * [**] Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634] -[*] Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110] * [*] Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110] * [*] Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264] * [*] Media & Text blocks correctly show an error message when the attached video upload fails [https://github.com/WordPress/gutenberg/pull/59288] From 07f5e24ab4e8bdd93da7322222dd8f83a7c03329 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 23 Feb 2024 17:10:12 +0000 Subject: [PATCH 18/19] Update Gutenberg reference --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 112c325a8a..44d4886d6a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 112c325a8a0094871db8650f47b6463718538619 +Subproject commit 44d4886d6a11bdc27d528ff62be488a8edf0b44f From 9f223de75fbff7dc68072c6f969201bc71d9865f Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 23 Feb 2024 17:11:04 +0000 Subject: [PATCH 19/19] Update Jetpack reference --- jetpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetpack b/jetpack index f1ae7fb120..68f87a4058 160000 --- a/jetpack +++ b/jetpack @@ -1 +1 @@ -Subproject commit f1ae7fb120221b3c678e11f4008149ab04abf289 +Subproject commit 68f87a40581c6ed07e22cbb25f51194fdb736b85