Skip to content

Commit

Permalink
update to tinymce 6
Browse files Browse the repository at this point in the history
  • Loading branch information
@ninianne98
ninianne98 committed Apr 21, 2024
1 parent 05e4584 commit 6e427ee
Show file tree
Hide file tree
Showing 151 changed files with 4,331 additions and 20,515 deletions.
118 changes: 93 additions & 25 deletions CMSAdmin/CMSAdmin.csproj
View file
Expand Up @@ -853,73 +853,127 @@
<Content Include="c3-admin\skins\popup.sandstone.min.css" />
<Content Include="c3-admin\skins\popup.sugaralmond.min.css" />
<Content Include="c3-admin\tinymce\icons\default\icons.min.js" />
<Content Include="c3-admin\tinymce\jquery.tinymce.min.js" />
<Content Include="c3-admin\tinymce\langs\README.md" />
<Content Include="c3-admin\tinymce\license.txt" />
<Content Include="c3-admin\tinymce\models\dom\model.min.js" />
<Content Include="c3-admin\tinymce\plugins\accordion\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\advlist\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\anchor\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\autolink\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\autoresize\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\autosave\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\bbcode\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\charmap\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\codesample\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\code\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\colorpicker\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\contextmenu\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\directionality\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\emoticons\js\emojiimages.js" />
<Content Include="c3-admin\tinymce\plugins\emoticons\js\emojiimages.min.js" />
<Content Include="c3-admin\tinymce\plugins\emoticons\js\emojis.js" />
<Content Include="c3-admin\tinymce\plugins\emoticons\js\emojis.min.js" />
<Content Include="c3-admin\tinymce\plugins\emoticons\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\fullpage\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\fullscreen\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ar.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\bg_BG.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ca.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\cs.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\da.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\de.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\el.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\en.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\es.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\eu.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\fa.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\fi.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\fr_FR.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\he_IL.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\hi.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\hr.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\hu_HU.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\id.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\it.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ja.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\kk.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ko_KR.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ms.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\nb_NO.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\nl.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\pl.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\pt_BR.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\pt_PT.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ro.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\ru.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\sk.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\sl_SI.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\sv_SE.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\th_TH.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\tr.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\uk.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\vi.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\zh_CN.js" />
<Content Include="c3-admin\tinymce\plugins\help\js\i18n\keynav\zh_TW.js" />
<Content Include="c3-admin\tinymce\plugins\help\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\hr\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\imagetools\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\image\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\importcss\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\insertdatetime\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\legacyoutput\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\link\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\lists\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\media\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\nonbreaking\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\noneditable\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\pagebreak\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\paste\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\preview\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\print\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\quickbars\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\save\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\searchreplace\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\spellchecker\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\tabfocus\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\table\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\template\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\textcolor\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\textpattern\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\toc\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\visualblocks\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\visualchars\plugin.min.js" />
<Content Include="c3-admin\tinymce\plugins\wordcount\plugin.min.js" />
<Content Include="c3-admin\tinymce\README.md" />
<Content Include="c3-admin\tinymce\skins\content\dark\content.js" />
<Content Include="c3-admin\tinymce\skins\content\dark\content.min.css" />
<Content Include="c3-admin\tinymce\skins\content\default\content.js" />
<Content Include="c3-admin\tinymce\skins\content\default\content.min.css" />
<Content Include="c3-admin\tinymce\skins\content\document\content.js" />
<Content Include="c3-admin\tinymce\skins\content\document\content.min.css" />
<Content Include="c3-admin\tinymce\skins\content\tinymce-5-dark\content.js" />
<Content Include="c3-admin\tinymce\skins\content\tinymce-5-dark\content.min.css" />
<Content Include="c3-admin\tinymce\skins\content\tinymce-5\content.js" />
<Content Include="c3-admin\tinymce\skins\content\tinymce-5\content.min.css" />
<Content Include="c3-admin\tinymce\skins\content\writer\content.js" />
<Content Include="c3-admin\tinymce\skins\content\writer\content.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\content.inline.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\content.inline.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\content.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\content.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\content.mobile.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\skin.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\skin.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\skin.mobile.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\skin.shadowdom.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\skin.shadowdom.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\content.inline.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\content.inline.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\content.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\content.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\content.mobile.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\skin.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\skin.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\skin.mobile.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\skin.shadowdom.js" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\skin.shadowdom.min.css" />
<Content Include="c3-admin\tinymce\themes\mobile\theme.min.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\content.inline.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\content.inline.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\content.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\content.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\skin.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\skin.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\skin.shadowdom.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5-dark\skin.shadowdom.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\content.inline.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\content.inline.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\content.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\content.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\skin.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\skin.min.css" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\skin.shadowdom.js" />
<Content Include="c3-admin\tinymce\skins\ui\tinymce-5\skin.shadowdom.min.css" />
<Content Include="c3-admin\tinymce\themes\silver\theme.min.js" />
<Content Include="c3-admin\tinymce\tinymce.min.js" />
<Content Include="c3-admin\ucEditDateTime.ascx" />
Expand Down Expand Up @@ -1290,6 +1344,24 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="c3-admin\tinymce\plugins\bbcode\" />
<Folder Include="c3-admin\tinymce\plugins\colorpicker\" />
<Folder Include="c3-admin\tinymce\plugins\contextmenu\" />
<Folder Include="c3-admin\tinymce\plugins\fullpage\" />
<Folder Include="c3-admin\tinymce\plugins\hr\" />
<Folder Include="c3-admin\tinymce\plugins\imagetools\" />
<Folder Include="c3-admin\tinymce\plugins\legacyoutput\" />
<Folder Include="c3-admin\tinymce\plugins\noneditable\" />
<Folder Include="c3-admin\tinymce\plugins\paste\" />
<Folder Include="c3-admin\tinymce\plugins\print\" />
<Folder Include="c3-admin\tinymce\plugins\spellchecker\" />
<Folder Include="c3-admin\tinymce\plugins\tabfocus\" />
<Folder Include="c3-admin\tinymce\plugins\textcolor\" />
<Folder Include="c3-admin\tinymce\plugins\textpattern\" />
<Folder Include="c3-admin\tinymce\plugins\toc\" />
<Folder Include="c3-admin\tinymce\skins\ui\oxide-dark\fonts\" />
<Folder Include="c3-admin\tinymce\skins\ui\oxide\fonts\" />
<Folder Include="c3-admin\tinymce\themes\mobile\" />
</ItemGroup>
<ItemGroup>
<Content Include="abundant\abundant.master" />
Expand Down Expand Up @@ -1324,10 +1396,6 @@
<Content Include="cmsTemplates\Imagination\css\font\FontAwesome.otf" />
<Content Include="cmsTemplates\Imagination\imagination.master" />
<Content Include="cmsTemplates\Imagination\Skin.config" />
<Content Include="c3-admin\tinymce\langs\README.md" />
<Content Include="c3-admin\tinymce\README.md" />
<Content Include="c3-admin\tinymce\skins\ui\oxide-dark\fonts\tinymce-mobile.woff" />
<Content Include="c3-admin\tinymce\skins\ui\oxide\fonts\tinymce-mobile.woff" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
18 changes: 3 additions & 15 deletions CMSAdmin/c3-admin/Includes/tinymce-config.js
View file
Expand Up @@ -14,19 +14,6 @@ function cmsTinyMceInit(winWidth, winHeight, allowResize) {

tinyBrowseResize = allowResize;

/*
menu: {
file: { title: 'File', items: 'newdocument restoredraft | preview | print ' },
edit: { title: 'Edit', items: 'undo redo | cut copy paste | selectall | searchreplace' },
view: { title: 'View', items: 'code | visualaid visualchars visualblocks | spellchecker | preview fullscreen' },
insert: { title: 'Insert', items: 'image link media template codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor toc | insertdatetime' },
format: { title: 'Format', items: 'bold italic underline strikethrough superscript subscript codeformat | formats blockformats fontformats fontsizes align lineheight | forecolor backcolor | removeformat' },
tools: { title: 'Tools', items: 'spellchecker spellcheckerlanguage | code wordcount' },
table: { title: 'Table', items: 'inserttable | cell row column | tableprops deletetable' },
help: { title: 'Help', items: 'help' }
}
*/

if (tinymce) {
// because ajax...
tinymce.remove();
Expand All @@ -40,8 +27,9 @@ function cmsTinyMceInit(winWidth, winHeight, allowResize) {
selector: "textarea.mceEditor",
file_picker_types: 'file image media',
file_picker_callback: cmsTinyFileBrowserCallback,
plugins: 'image imagetools link lists media charmap searchreplace visualblocks paste print table preview code codesample help',
toolbar1: 'bold italic underline strikethrough sub sup | formatselect forecolor backcolor | blockquote alignleft aligncenter alignright alignjustify outdent indent | help | ',
promotion: false,
plugins: 'image link lists media charmap searchreplace visualblocks table preview code codesample help',
toolbar1: 'bold italic underline strikethrough sub sup | blocks forecolor backcolor | blockquote alignleft aligncenter alignright alignjustify outdent indent | help | ',
toolbar2: 'undo redo searchreplace | bullist numlist | removeformat pastetext | link unlink anchor image media customfilebrowser | charmap codesample code preview visualblocks',
removed_menuitems: 'newdocument help',
codesample_languages: [
Expand Down
10 changes: 9 additions & 1 deletion CMSAdmin/c3-admin/Includes/tinymceoverride.css
View file
Expand Up @@ -63,11 +63,19 @@
font-size: 14px !important;
}

.tox-toolbar__group {
border-right: 1px solid #ccc !important;
}

.tox-toolbar-overlord {
border-top: 1px solid #ccc !important;
}

@media screen and (min-width: 1350px) {
.tox .tox-listboxfield .tox-listbox--select,
.tox .tox-textarea,
.tox .tox-textfield,
.tox .tox-toolbar-textfield {
font-size: 16px !important;
}
}
}

0 comments on commit 6e427ee

Please sign in to comment.