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

Jump to bottom

feat(NcRichText): Support icon class for smart picker integrations #3882

Merged
merged 1 commit into from Mar 14, 2023
Merged

feat(NcRichText): Support icon class for smart picker integrations #3882

merged 1 commit into from Mar 14, 2023

Conversation

nickvergessen
Copy link
Contributor

@nickvergessen nickvergessen commented Mar 13, 2023 •
edited

For nextcloud/spreed#9053

Before After
grafik grafik

@nickvergessen nickvergessen added bug Something isn't working 3. to review Waiting for reviews regression Regression of a previous working feature feature: richtext Related to the richtext component labels Mar 13, 2023
@nickvergessen nickvergessen self-assigned this Mar 13, 2023
@nickvergessen nickvergessen mentioned this pull request Mar 13, 2023
Merged
5 tasks
@nickvergessen nickvergessen force-pushed the bugfix/noid/support-icon-class-for-smart-picker branch from dee4d50 to 80c9937 Compare March 13, 2023 19:13
julien-nc
julien-nc approved these changes Mar 13, 2023
View reviewed changes
Copy link
Contributor

@julien-nc julien-nc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested with nextcloud/spreed#9053
Works fine except one class should be adjusted in spreed's search results.

@nickvergessen
feat(NcRichText): Support icon class for smart picker integrations
aa9f24f 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/noid/support-icon-class-for-smart-picker branch from 80c9937 to aa9f24f Compare March 14, 2023 15:27
Antreesy
Antreesy approved these changes Mar 14, 2023
View reviewed changes
Copy link
Contributor

@Antreesy Antreesy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should works properly, except from one thing: if we'll have both an entry.thumbnailUrl and an entry.icon (as a fallback). it could be better to switch their order

@nickvergessen nickvergessen merged commit e5ff79a into master Mar 14, 2023
@nickvergessen nickvergessen deleted the bugfix/noid/support-icon-class-for-smart-picker branch March 14, 2023 17:13
@julien-nc julien-nc mentioned this pull request Mar 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julien-nc julien-nc julien-nc approved these changes

@Antreesy Antreesy Antreesy approved these changes

@raimund-schluessler raimund-schluessler Awaiting requested review from raimund-schluessler

@marcoambrosini marcoambrosini Awaiting requested review from marcoambrosini

@ShGKme ShGKme Awaiting requested review from ShGKme

Assignees

@nickvergessen nickvergessen

Labels
3. to review Waiting for reviews bug Something isn't working feature: richtext Related to the richtext component regression Regression of a previous working feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nickvergessen @julien-nc @Antreesy