Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: upgrade TinyMCE v4.0.20 to TinyMCE v5.5.1 (#30335)

Browse Source 
Co-authored-by: Arunmozhi <arunmozhi@opencraft.com>
This commit is contained in:
Sandeep Dubey
2022-09-19 16:13:19 +05:30
committed by GitHub
parent baeb64d13e
commit 51b5e624b3
305 changed files with 128730 additions and 115438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
xmodule/js/src/html/edit.js
View File

@@ -99,8 +99,8 @@
var tinyMceConfig = {
script_url: baseUrl + "js/vendor/tinymce/js/tinymce/tinymce.full.min.js",
font_formats: _getFonts(),
theme: "modern",
skin: 'studio-tmce4',
theme: "silver",
skin: "studio-tmce5",
schema: "html5",
entity_encoding: "raw",
@@ -125,19 +125,23 @@
Disable visual aid on borderless table.
*/
visual: false,
plugins: "textcolor, link, image, codemirror",
plugins: "lists, link, image, codemirror",
codemirror: {
path: baseUrl + "js/vendor"
path: baseUrl + "js/vendor",
disableFilesMerge: true,
jsFiles: ["codemirror-compressed.js"],
cssFiles: ["CodeMirror/codemirror.css"]
},
image_advtab: true,
/*
We may want to add "styleselect" when we collect all styles used throughout the LMS
*/
toolbar: "formatselect | fontselect | bold italic underline forecolor wrapAsCode | " +
"alignleft aligncenter alignright alignjustify | " +
"bullist numlist outdent indent blockquote | link unlink " +
((this.new_image_modal ? 'insertImage' : 'image') + " | code"),
toolbar: "formatselect fontselect bold italic underline forecolor wrapAsCode " +
"alignleft aligncenter alignright alignjustify " +
"bullist numlist outdent indent blockquote link unlink " +
((this.new_image_modal ? 'insertImage' : 'image') + " code"),
block_formats: edx.StringUtils.interpolate(
gettext("{paragraph}=p;{preformatted}=pre;{heading3}=h3;{heading4}=h4;{heading5}=h5;{heading6}=h6"),
{
@@ -149,7 +153,7 @@
heading6: gettext("Heading 6")
}),
width: '100%',
height: '400px',
height: '435px',
menubar: false,
statusbar: false,
@@ -1233,25 +1237,25 @@
}
HTMLEditingDescriptor.prototype.setupTinyMCE = function(ed) {
ed.addButton('wrapAsCode', {
ed.ui.registry.addButton('wrapAsCode', {
/*
Translators: this is a toolbar button tooltip from the raw HTML editor displayed in the browser when a user needs to edit HTML
*/
title: gettext('Code block'),
image: baseUrl + "images/ico-tinymce-code.png",
onclick: function() {
tooltip: gettext('Code block'),
icon: 'code-sample',
onAction: function() {
return ed.formatter.toggle('code');
}
});
ed.addButton('insertImage', {
ed.ui.registry.addButton('insertImage', {
/*
Translators: this is a toolbar button tooltip from the raw HTML editor displayed in the browser when a user needs to edit HTML
*/
title: gettext('Insert/Edit Image'),
tooltip: gettext('Insert/Edit Image'),
icon: 'image',
onclick: this.openImageModal
onAction: this.openImageModal
});
this.visualEditor = ed;
this.imageModal = $('#edit-image-modal #modalWrapper');
@@ -1266,7 +1270,7 @@
ed.on('EditLink', this.editLink);
ed.on('ShowCodeEditor', this.showCodeEditor);
ed.on('SaveCodeEditor', this.saveCodeEditor);
$(".action-cancel").on('click', this.cancelButton)
$(".action-cancel").on('click', this.cancelButton);
this.imageModal.on('closeModal', this.closeImageModal);
return this.imageModal.on('submitForm', this.editImageSubmit);
@@ -1386,7 +1390,7 @@
haven't dirtied the Editor. Store the raw content so we can compare it later.
*/
this.starting_content = visualEditor.getContent({
format: "raw",
format: "text",
no_events: 1
});
return visualEditor.focus();
@@ -1406,7 +1410,7 @@
if (this.editor_choice === 'visual') {
visualEditor = this.getVisualEditor();
raw_content = visualEditor.getContent({
format: "raw",
format: "text",
no_events: 1
});
if (this.starting_content !== raw_content) {