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

[BB-6151] Update TinyMCE Editor static file references to upgraded version 5.x #1869

Merged
merged 12 commits into from
Sep 14, 2022
Merged

[BB-6151] Update TinyMCE Editor static file references to upgraded version 5.x #1869

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32c4516
feat: replace references to tinymce v4 with v5
tecoholic Jul 1, 2022
8d1e329
fix: set tinymce base url so resources are loaded in studio
tecoholic Jul 5, 2022
beaf227
fix: theme files not loading on studio edit window
tecoholic Jul 7, 2022
00caaaa
fix: tinymce editor not loading in edit window for simple editor setting
tecoholic Jul 7, 2022
cb5d604
chore: bumped minor version to 4.5.0
tecoholic Jul 12, 2022
e80eecf
chore: update edx paragon to latest version
tecoholic Aug 17, 2022
f6dbe3d
fix: failing tests due to paragon api change
tecoholic Aug 18, 2022
dcf56d3
fix: use correct path for pulling translations
Agrendalath Sep 9, 2022
34e3b01
chore: update translations
Agrendalath Sep 9, 2022
a3847e8
chore: build static files after updating translations
Agrendalath Sep 9, 2022
b0c2cae
chore: rebuild source translations
Agrendalath Sep 9, 2022
e968175
chore: rebuild static & translations after conflict resolution
tecoholic Sep 13, 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
Prev Previous commit
Next Next commit
fix: tinymce editor not loading in edit window for simple editor setting
  • Loading branch information
@tecoholic
tecoholic committed Sep 13, 2022
commit 00caaaa0cd5ca2fac4f10d02947afab978369516
4 changes: 2 additions & 2 deletions openassessment/xblock/static/dist/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"openassessment-rtl.js": "/openassessment-rtl.42f8f6a5fc7e1c4c4fae.js",
"openassessment-rtl.css.map": "/openassessment-rtl.42f8f6a5fc7e1c4c4fae.css.map",
"openassessment-rtl.js.map": "/openassessment-rtl.42f8f6a5fc7e1c4c4fae.js.map",
"openassessment-studio.js": "/openassessment-studio.58b2ba83b5a5510a37d1.js",
"openassessment-studio.js.map": "/openassessment-studio.58b2ba83b5a5510a37d1.js.map",
"openassessment-studio.js": "/openassessment-studio.351ac48fcc86334195a4.js",
"openassessment-studio.js.map": "/openassessment-studio.351ac48fcc86334195a4.js.map",
"default-avatar.svg": "/95ec738c0b7faac5b5c9126794446bbd.svg"
}
2 changes: 1 addition & 1 deletion openassessment/xblock/static/dist/openassessment-editor-textarea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/******/
/******/ var hotApplyOnUpdate = true;
/******/ // eslint-disable-next-line no-unused-vars
/******/ var hotCurrentHash = "9f6607aa5eaa8941a2cf";
/******/ var hotCurrentHash = "e489bb794b050d713baa";
/******/ var hotRequestTimeout = 10000;
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentChildModule;
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/static/dist/openassessment-editor-tinymce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/******/
/******/ var hotApplyOnUpdate = true;
/******/ // eslint-disable-next-line no-unused-vars
/******/ var hotCurrentHash = "9f6607aa5eaa8941a2cf";
/******/ var hotCurrentHash = "e489bb794b050d713baa";
/******/ var hotRequestTimeout = 10000;
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentChildModule;
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/static/dist/openassessment-lms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/******/
/******/ var hotApplyOnUpdate = true;
/******/ // eslint-disable-next-line no-unused-vars
/******/ var hotCurrentHash = "9f6607aa5eaa8941a2cf";
/******/ var hotCurrentHash = "e489bb794b050d713baa";
/******/ var hotRequestTimeout = 10000;
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentChildModule;
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/static/dist/openassessment-ltr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/******/
/******/ var hotApplyOnUpdate = true;
/******/ // eslint-disable-next-line no-unused-vars
/******/ var hotCurrentHash = "9f6607aa5eaa8941a2cf";
/******/ var hotCurrentHash = "e489bb794b050d713baa";
/******/ var hotRequestTimeout = 10000;
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentChildModule;
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/static/dist/openassessment-rtl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/******/
/******/ var hotApplyOnUpdate = true;
/******/ // eslint-disable-next-line no-unused-vars
/******/ var hotCurrentHash = "9f6607aa5eaa8941a2cf";
/******/ var hotCurrentHash = "e489bb794b050d713baa";
/******/ var hotRequestTimeout = 10000;
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentChildModule;
Expand Down
4 changes: 2 additions & 2 deletions ...assessment-studio.58b2ba83b5a5510a37d1.js → ...assessment-studio.351ac48fcc86334195a4.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions openassessment/xblock/static/dist/openassessment-studio.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion openassessment/xblock/static/js/src/studio/oa_tiny_mce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const oaTinyMCE = (options) => {
return {
height: '300',
font_formats: getFonts(),
base_url: '/static/studio/js/vendor/tinymce/js/tinymce/',
theme: 'silver',
skin: 'studio-tmce5',
content_css: 'studio-tmce5',
Expand All @@ -58,7 +59,7 @@ export const oaTinyMCE = (options) => {
code: { inline: 'code' },
},
visual: false,
plugins: 'textcolor, link, image, media',
plugins: 'link, image, media',
image_advtab: true,
toolbar: 'formatselect | fontselect | bold italic underline forecolor | '
+ 'bullist numlist outdent indent blockquote | link unlink image media',
Expand Down