Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V10: Find and persist embedded images in rich text #14546

Merged
merged 8 commits into from
Jul 18, 2023
Merged

V10: Find and persist embedded images in rich text #14546

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e55a133
add method to find and persist embedded base64 (data-uri) images in a…
iOvergaard Jul 12, 2023
176f7b6
use method to find embedded images in the Umbraco.TinyMce and Umbraco…
iOvergaard Jul 12, 2023
59305f6
rename method to better reflect what it does
iOvergaard Jul 12, 2023
8e431e6
set allowed upload file types for integration tests
iOvergaard Jul 12, 2023
0cdaf36
add test for embedded images in Umbraco.TinyMce
iOvergaard Jul 12, 2023
fee0456
let old ctor call new ctor
iOvergaard Jul 17, 2023
da45de4
Apply suggestions from code review
iOvergaard Jul 17, 2023
5b84fcd
apply pattern matching
iOvergaard Jul 17, 2023
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 src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ public GridPropertyValueEditor(

if (html is not null)
{
var parseAndSavedTempImages = _pastedImages.FindAndPersistPastedTempImages(html, mediaParentId, userId, _imageUrlGenerator);
var parseAndSaveBase64Images = _pastedImages.FindAndPersistEmbeddedImages(
html, mediaParentId, userId);
var parseAndSavedTempImages = _pastedImages.FindAndPersistPastedTempImages(parseAndSaveBase64Images, mediaParentId, userId);
var editorValueWithMediaUrlsRemoved = _imageSourceParser.RemoveImageSources(parseAndSavedTempImages);
rte.Value = editorValueWithMediaUrlsRemoved;
}
Expand Down
Loading