Skip to content

Commit

Permalink
Remove profile / add extra javascript files from cycle2
Browse files Browse the repository at this point in the history
  • Loading branch information
rodfersou committed May 19, 2015
1 parent a0b37c5 commit 557e428
Show file tree
Hide file tree
Showing 26 changed files with 98 additions and 108 deletions.
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ There's a frood who really knows where his towel is.
1.0a2 (unreleased)
------------------

- Nothing changed yet.
- Remove profile (unregister resources) and add extra javascript files from cyle2. (closes `#1`_)
[rodfersou]


1.0a1 (2014-10-20)
------------------

- Initial release.

.. _`#1`: https://github.com/collective/collective.js.cycle2/issues/1
12 changes: 9 additions & 3 deletions src/collective/js/cycle2/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,25 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:five="http://namespaces.zope.org/five"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
xmlns:gs="http://namespaces.zope.org/genericsetup"
i18n_domain="collective.js.cycle2">

<five:registerPackage package="." />

<genericsetup:registerProfile
<!-- Register profile -->
<gs:registerProfile
name="default"
title="collective.js.cycle2"
directory="profiles/default"
description="Integration of Cycle2 jQuery plugin in Plone."
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

<browser:resourceDirectory name="collective.js.cycle2" directory="static" />
<include package=".upgrades" />

<browser:resourceDirectory
name="collective.js.cycle2"
directory="resources"
/>

</configure>
7 changes: 0 additions & 7 deletions src/collective/js/cycle2/profiles/default/browserlayer.xml

This file was deleted.

12 changes: 0 additions & 12 deletions src/collective/js/cycle2/profiles/default/jsregistry.xml

This file was deleted.

2 changes: 1 addition & 1 deletion src/collective/js/cycle2/profiles/default/metadata.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<metadata>
<version>1000</version>
<version>1001</version>
</metadata>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/collective/js/cycle2/resources/jquery.cycle2.flip.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/collective/js/cycle2/resources/jquery.cycle2.tile.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/collective/js/cycle2/resources/jquery.cycle2.video.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions src/collective/js/cycle2/testing.py

This file was deleted.

Empty file.
55 changes: 0 additions & 55 deletions src/collective/js/cycle2/tests/test_setup.py

This file was deleted.

28 changes: 28 additions & 0 deletions src/collective/js/cycle2/upgrades/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
from plone.app.upgrade.utils import loadMigrationProfile
from zope.component.hooks import getSite

import logging


logger = logging.getLogger('collective.js.cycle2')


def remove_profile(context):
"""Profiles should not be mantained into JS packages"""

profile = 'profile-collective.js.cycle2:default'
loadMigrationProfile(context, profile)
logger.info('Remove browser layer')

site = getSite()
js_tool = site.portal_javascripts
ids_to_remove = [
"++resource++collective.js.cycle2/jquery.cycle2.min.js",
"++resource++collective.js.cycle2/jquery.cycle2.center.min.js",
"++resource++collective.js.cycle2/jquery.cycle2.swipe.min.js"
]
for js_id in ids_to_remove:
js_tool.unregisterResource(js_id)
logger.info('"{0}" resource was removed"'.format(js_id))
js_tool.cookResources()
logger.info('JS resources were cooked')
30 changes: 30 additions & 0 deletions src/collective/js/cycle2/upgrades/configure.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:i18n="http://namespaces.zope.org/i18n"
xmlns:gs="http://namespaces.zope.org/genericsetup"
i18n_domain="collective.js.cycle2">

<!-- Register profile -->
<gs:registerProfile
name="default"
title="collective.js.cycle2"
directory="profiles/default"
description="Integration of Cycle2 jQuery plugin in Plone."
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

<!-- Upgrade Steps -->
<gs:upgradeSteps
source="1000"
destination="1001"
profile="collective.js.cycle2:default">

<gs:upgradeStep
title="Remove browser layer and jsregistry"
description="We don't need a profile for this package."
handler=".remove_profile"
/>

</gs:upgradeSteps>

</configure>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0"?>
<layers>
<layer name="collective.js.cycle2"
interface="collective.js.cycle2.interfaces.IAddOnInstalled"
remove="True" />
</layers>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0"?>
<metadata>
<version>1001</version>
</metadata>

0 comments on commit 557e428

Please sign in to comment.