Skip to content

feat(maple): allow overriding TinyMCE config using settings [BB-6889] #511

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 24, 2022
Merged

feat(maple): allow overriding TinyMCE config using settings [BB-6889] #511

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
1089a77
feat: allow overriding TinyMCE config using settings
tecoholic Nov 23, 2022
5f5dbf4
test: fix quality
Agrendalath Nov 23, 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
1 change: 0 additions & 1 deletion cms/djangoapps/contentstore/views/component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,6 @@ def component_handler(request, usage_key_string, handler, suffix=''):
"""
usage_key = UsageKey.from_string(usage_key_string)


# Addendum:
# TNL 101-62 studio write permission is also checked for editing content.

Expand Down
2 changes: 2 additions & 0 deletions cms/djangoapps/contentstore/views/tests/test_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,9 @@ def test_create_nicely(self):
# check against the template
template = ProblemBlock.get_template(template_id)
self.assertEqual(problem.data, template['data'])
# pylint: disable=unsubscriptable-object
self.assertEqual(problem.display_name, template['metadata']['display_name'])
# pylint: disable=unsubscriptable-object
self.assertEqual(problem.markdown, template['metadata']['markdown'])

def test_create_item_negative(self):
Expand Down
2 changes: 2 additions & 0 deletions cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,8 @@
##### custom vendor plugin variables #####
# JavaScript code can access this data using `process.env.JS_ENV_EXTRA_CONFIG`
# One of the current use cases for this is enabling custom TinyMCE plugins
# (TINYMCE_ADDITIONAL_PLUGINS) and overriding the TinyMCE configuration
# (TINYMCE_CONFIG_OVERRIDES).
JS_ENV_EXTRA_CONFIG = {}

############################### PIPELINE #######################################
Expand Down
6 changes: 6 additions & 0 deletions common/lib/xmodule/xmodule/js/src/html/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@
}
});
}

// apply configuration overrides if have been defined
var tinyMceConfigOverrides = process.env.JS_ENV_EXTRA_CONFIG.TINYMCE_CONFIG_OVERRIDES;
if (tinyMceConfigOverrides) {
Object.assign(tinyMceConfig, tinyMceConfigOverrides);
}
}

this.tiny_mce_textarea = $(".tiny-mce", this.element).tinymce(tinyMceConfig);
Expand Down