Skip to content

Commit

Permalink
fix #1811: Remove last legacy Javascript highlight-searchterms.js and…
Browse files Browse the repository at this point in the history
… its skins folder.

ref #1801
  • Loading branch information
jensens committed Mar 9, 2017
1 parent 3e68e58 commit 8b1c87a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 231 deletions.
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ Bug fixes:
This solves a problem, where Editors couldn't see inactive content, even though they had the required permission on a subpath of the portal (e.g. a subsite).
[thet]

- Remove last legacy Javascript ``highlight-searchterms.js``.
Removes also the skins folder ``plone_ecmascript``.
It was broken for all (Google, other search engines, own live search);
JS worked only when coming from Plone detailed search.
[jensens]


5.1b2 (2017-02-20)
------------------
Expand Down
3 changes: 0 additions & 3 deletions Products/CMFPlone/profiles/default/skins.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
cookie_persistence="False" default_skin="Plone Default"
request_varname="plone_skin">
<object name="custom" meta_type="Folder"/>
<object name="plone_ecmascript" meta_type="Filesystem Directory View"
directory="Products.CMFPlone:skins/plone_ecmascript"/>
<object name="plone_form_scripts" meta_type="Filesystem Directory View"
directory="Products.CMFPlone:skins/plone_form_scripts"/>
<object name="plone_images" meta_type="Filesystem Directory View"
Expand All @@ -21,7 +19,6 @@
directory="Products.CMFPlone:skins/plone_wysiwyg"/>
<skin-path name="Plone Default">
<layer name="custom"/>
<layer name="plone_ecmascript"/>
<layer name="plone_wysiwyg"/>
<layer name="plone_prefs"/>
<layer name="plone_templates"/>
Expand Down
11 changes: 2 additions & 9 deletions Products/CMFPlone/profiles/dependencies/registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -955,14 +955,8 @@
<value key="js">++plone++static/components/jquery.recurrenceinput.js/lib/jquery.tmpl.js</value>
<value key="deps">jquery</value>
</records>
<!-- legacy js -->


<records prefix="plone.resources/jquery-highlightsearchterms"
interface='Products.CMFPlone.interfaces.IResourceRegistry'>
<value key="js">jquery.highlightsearchterms.js</value>
</records>


<!-- legacy js -->
<record name="plone.resources.last_legacy_import">
<field type="plone.registry.field.Datetime">
<title>Last legacy js/css import date</title>
Expand Down Expand Up @@ -1114,7 +1108,6 @@
interface='Products.CMFPlone.interfaces.IBundleRegistry'>
<value key="merge_with">default</value>
<value key="resources" purge="false">
<element>jquery-highlightsearchterms</element>
</value>
<value key="depends">plone</value>
<value key="jscompilation">++plone++static/plone-legacy-compiled.js</value>
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion Products/CMFPlone/tests/testCSSandJSRegistry.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def testDefaultJSIsInstalled(self):
)
expected = [
'++resource++plone.js',
'jquery.highlightsearchterms.js'
]
js_files = {x.js for x in installedResources.values()}
for e in expected:
Expand Down

0 comments on commit 8b1c87a

Please sign in to comment.