Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
44cda65
Bump Aztec version to v1.5.9
derekblank Jun 21, 2022
a71361f
fix: Image block preserves alt text from media library
dcalhoun Jun 20, 2022
23067bf
refactor: Remove debugging code
dcalhoun Jun 21, 2022
2396955
build: Update Gutenberg ref
dcalhoun Jun 21, 2022
49570cd
docs: Update release notes
dcalhoun Jun 21, 2022
de5c223
build: Update Gutenberg ref
dcalhoun Jun 21, 2022
bae159f
Update gutenberg mobile ref to v1.79.0-alpha1
derekblank Jun 22, 2022
ec2a7a4
Add beforeMediaDeleted implementation
Jun 22, 2022
2679fe1
Merge pull request #16780 from wordpress-mobile/aztec/update-aztec-pl…
derekblank Jun 23, 2022
0a0c818
Merge branch 'gutenberg/after_1.79.0' of github.com:wordpress-mobile/…
dcalhoun Jun 23, 2022
e61f4dc
build: Update Gutenberg ref
dcalhoun Jun 23, 2022
24fd7e2
Merge pull request #16787 from wordpress-mobile/fix/image-block-prese…
dcalhoun Jun 23, 2022
6db98ef
Release script: Update build.gradle gutenbergMobileVersion to ref
dcalhoun Jul 7, 2022
f67f1ab
docs: Update release notes
dcalhoun Jul 7, 2022
a853ad0
Merge branch 'gutenberg/integrate_release_1.79.0' of github.com:wordp…
dcalhoun Jul 7, 2022
7c7409a
docs: Remove outdated release note
dcalhoun Jul 7, 2022
4efed20
Merge pull request #16885 from wordpress-mobile/gutenberg/after_1.79.0
dcalhoun Jul 7, 2022
cbe01ac
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…
dcalhoun Jul 7, 2022
55e8f35
build: Update Gutenberg ref
dcalhoun Jul 7, 2022
3017fed
fix: Remove duplicative beforeMediaDeleted implementation
dcalhoun Jul 7, 2022
66eab51
Update Gutenberg build.gradle ref to 1.79.0
derekblank Jul 8, 2022
703897f
Fix Gutenberg ref syntax
derekblank Jul 8, 2022
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
4 changes: 3 additions & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

20.3
-----

* [*] Block Editor: Add 'Insert from URL' option to Video block [https://github.com/WordPress/gutenberg/pull/41493]
* [*] Block Editor: Image block copies the alt text from the media library when selecting an item [https://github.com/WordPress/gutenberg/pull/41839]
* [*] Block Editor: Introduce "block recovery" option for invalid blocks [https://github.com/WordPress/gutenberg/pull/41988]

20.2
-----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public static MediaModel mediaModelFromMediaFile(MediaFile file) {
mediaModel.setTitle(file.getTitle());
mediaModel.setDescription(file.getDescription());
mediaModel.setCaption(file.getCaption());
mediaModel.setAlt(file.getAlt());
mediaModel.setMediaId(file.getMediaId() != null ? Long.valueOf(file.getMediaId()) : 0);
mediaModel.setId(file.getId());
mediaModel.setUploadState(file.getUploadState());
Expand All @@ -75,6 +76,7 @@ public static MediaFile mediaFileFromMediaModel(MediaModel media) {
mediaFile.setTitle(media.getTitle());
mediaFile.setDescription(media.getDescription());
mediaFile.setCaption(media.getCaption());
mediaFile.setAlt(media.getAlt());
mediaFile.setUploadState(media.getUploadState());
mediaFile.setVideo(org.wordpress.android.fluxc.utils.MediaUtils.isVideoMimeType(media.getMimeType()));
mediaFile.setVideoPressShortCode(ShortcodeUtils.getVideoPressShortcodeFromId(media.getVideoPressGuid()));
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
ext {
wordPressUtilsVersion = '2.6.0'
wordPressLoginVersion = '0.15.0'
gutenbergMobileVersion = 'v1.78.1'
gutenbergMobileVersion = 'v1.79.0'
storiesVersion = '1.4.0'
aboutAutomatticVersion = '0.0.6'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1297,10 +1297,6 @@ public void onMediaUploadSucceeded(final String localMediaId, final MediaFile me
}
}

@Override
public void beforeMediaDeleted(AztecAttributes aztecAttributes) {
}

@Override
public void onMediaDeleted(AztecAttributes aztecAttributes) {
String localMediaId = aztecAttributes.getValue(ATTR_ID_WP);
Expand All @@ -1310,6 +1306,11 @@ public void onMediaDeleted(AztecAttributes aztecAttributes) {
}
}

@Override
public void beforeMediaDeleted(@NonNull AztecAttributes aztecAttributes) {
// noop implementation for shared interface with block editor
}

private static class MediaPredicate implements AztecText.AttributePredicate, Parcelable {
private final String mId;
private final String mAttributeName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,8 @@ public void appendMediaFiles(Map<String, MediaFile> mediaList) {
url,
mediaEntry.getValue().getMimeType(),
mediaEntry.getValue().getCaption(),
mediaEntry.getValue().getTitle()));
mediaEntry.getValue().getTitle(),
mediaEntry.getValue().getAlt()));
}

getGutenbergContainerFragment().appendMediaFiles(rnMediaList);
Expand Down