Skip to content

fix: Styling issue in TinyMCE editor in Studio #31212

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

Merged
Agrendalath merged 2 commits into from
Nov 7, 2022
Merged

fix: Styling issue in TinyMCE editor in Studio #31212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2431880
fix: Styling issue in TinyMCE editor in studio
asadali145 Oct 26, 2022
0679ea8
fix: Editor tests
asadali145 Oct 28, 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
2 changes: 1 addition & 1 deletion xmodule/js/spec/html/edit_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('HTMLEditingDescriptor', function() {
});
it('Returns data from Raw Editor if text has not changed', function(done) {
const visualEditorStub =
{getContent() { return 'original visual text' }};
{getContent() { return '<p>original visual text</p>' }};
spyOn(this.descriptor, 'getVisualEditor').and.callFake(() => visualEditorStub);

var self = this;
Expand Down
4 changes: 2 additions & 2 deletions xmodule/js/src/html/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@
haven't dirtied the Editor. Store the raw content so we can compare it later.
*/
this.starting_content = visualEditor.getContent({
format: "text",
format: "raw",
no_events: 1
});
return visualEditor.focus();
Expand All @@ -1410,7 +1410,7 @@
if (this.editor_choice === 'visual') {
visualEditor = this.getVisualEditor();
raw_content = visualEditor.getContent({
format: "text",
format: "raw",

@pdpinch pdpinch Nov 3, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This reverts a change in https://github.com/openedx/edx-platform/pull/30335/files#diff-bd3e3877ed43b0228f0227205afd052479229747ee194918aab121957b9b0edbR1393

@DubeySandeep @Agrendalath I don't suppose you could tell us why you made this change when upgrade TinyMCE to v5.5.1?

@Agrendalath Agrendalath Nov 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@pdpinch, TinyMCE docs replaced all occurrences of the raw format with text between v4 and v5. These formats are undocumented, and we mistakenly assumed that this is the new way to get/set content in TinyMCE v5.

cc: @tecoholic

@tecoholic tecoholic Nov 6, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@pdpinch What @Agrendalath mentioned in the previous comment. I made the change thinking that the TinyMCE has changed the values from raw to text as there were no references to raw as a value in the docs.

no_events: 1
});
if (this.starting_content !== raw_content) {
Expand Down