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

FIX TinyMCE Insert link from Files #1436

Merged
merged 1 commit into from
Jan 25, 2024
Merged

FIX TinyMCE Insert link from Files #1436

merged 1 commit into from
Jan 25, 2024

Conversation

sabina-talipova
Copy link
Contributor

@sabina-talipova sabina-talipova commented Jan 25, 2024 •
edited
Loading

Description

  • It looks like using $ conflicts with another library, so it was replaced with jQuery;
  • Fix existing getSelection function issue. See

Parent issue

@sabina-talipova sabina-talipova mentioned this pull request Jan 25, 2024
Closed
2 tasks
GuySartorelli
GuySartorelli requested changes Jan 25, 2024
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

The fix for the bug reported in the issue is fine - but the stuff you've added for the required link text doesn't work as expected. Details below.

client/src/entwine/TinyMCE_ssmedia.js Outdated Show resolved Hide resolved
client/src/entwine/TinyMCE_ssmedia.js Outdated Show resolved Hide resolved
@sabina-talipova sabina-talipova force-pushed the pulls/2.1/fix-insert-file-issue branch from 35c60c9 to bb3894e Compare January 25, 2024 20:50
GuySartorelli
GuySartorelli approved these changes Jan 25, 2024
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM

@GuySartorelli GuySartorelli merged commit 8607246 into silverstripe:2.1 Jan 25, 2024
12 checks passed
@GuySartorelli GuySartorelli deleted the pulls/2.1/fix-insert-file-issue branch January 25, 2024 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuySartorelli GuySartorelli GuySartorelli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sabina-talipova @GuySartorelli