Skip to content

Commit

Permalink
Include new paths for TinyMCE css. plone/Products.CMFPlone#2359
Browse files Browse the repository at this point in the history
  • Loading branch information
frapell committed Mar 27, 2018
1 parent 3697506 commit 8604bbd
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ New features:

Bug fixes:

- *add item here*
- Change in TinyMCE css location so bundles can be built without errors
Fixes `issue 2359 <https://github.com/plone/Products.CMFPlone/issues/2359>`_.
[frapell]


2.0.12 (2018-03-10)
Expand Down
8 changes: 4 additions & 4 deletions plone/app/upgrade/v51/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,10 @@ Add image scaling options to image handling control panel.
destination="5112"
profile="Products.CMFPlone:plone">

<gs:upgradeStep
title="Miscellaneous"
description=""
handler="..utils.null_upgrade_step"
<gs:upgradeDepends
title="Run to512 upgrade profile."
description="Update css resources for TinyMCE 4.7.6"
import_profile="plone.app.upgrade.v51:to512"
/>

</gs:upgradeSteps>
Expand Down
9 changes: 9 additions & 0 deletions plone/app/upgrade/v51/profiles.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,13 @@
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

<genericsetup:registerProfile
name="to512"
title="Upgrade profile for Plone 5.1.1 to Plone 5.1.2"
description=""
directory="profiles/to_512"
for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

</configure>
15 changes: 15 additions & 0 deletions plone/app/upgrade/v51/profiles/to_512/registry.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<registry>

<records prefix="plone.resources/tinymce"
interface='Products.CMFPlone.interfaces.IResourceRegistry'>
<value key="js">++plone++static/components/tinymce-builded/js/tinymce/tinymce.js</value>
<value key="export">window.tinyMCE</value>
<value key="init">function () { this.tinyMCE.DOM.events.domLoaded = true; return this.tinyMCE; }</value>
<value key="css">
<element>++plone++static/components/tinymce-builded/js/tinymce/skins/lightgray/skin.min.css</element>
<element>++plone++static/components/tinymce-builded/js/tinymce/skins/lightgray/content.min.css</element>
</value>
</records>

</registry>

0 comments on commit 8604bbd

Please sign in to comment.