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.

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

Add filter to manager so CSS and JS resources are not mixed when outputing by type #12915

Conversation

ninjapanzer
Copy link
Contributor

Hello!

In raising this pull request, I confirm the following (please check boxes):

  • I have read and understood the Contributing Guidelines?
  • I have checked that another pull request for this purpose does not exist.
  • I wrote some tests for this PR.

This PR adds a filter method which returns a new copy of the collection resources array that only includes the supplied type. So that a collection an contain a mix of JS and CSS resources so that:

  • outputJs will only return js resources from that collection
  • outputCss will only return css resources from that collection

Thanks
Paul Scarrone(ninjapanzer)paul@savvysoftworks.com

@ninjapanzer ninjapanzer changed the base branch from master to 3.2.x June 21, 2017 04:05
@ninjapanzer ninjapanzer changed the base branch from 3.2.x to 3.1.x June 21, 2017 04:06
@ninjapanzer ninjapanzer changed the base branch from 3.1.x to 3.2.x June 21, 2017 04:07
@sergeyklay sergeyklay added this to the 3.2.x milestone Jun 21, 2017
@sergeyklay
Copy link
Contributor

@ninjapanzer Could you please update the CHANGELOG.md?

@ninjapanzer ninjapanzer force-pushed the pks/asset_manager_with_mixed_resource_collection branch 4 times, most recently from db3c7f1 to ec020d2 Compare June 21, 2017 10:50
@ninjapanzer ninjapanzer force-pushed the pks/asset_manager_with_mixed_resource_collection branch from ec020d2 to 52b3fa4 Compare June 21, 2017 10:52
@ninjapanzer
Copy link
Contributor Author

@sergeyklay ChangeLog Updated.
I stated this branch a little behind on master before the force-update on 3.2.x so you may need to fetch an reset this branch locally as it has been rebased against 3.2.x officially now.

CHANGELOG.md Outdated
@@ -46,6 +46,7 @@
- Fixed `Phalcon\Cache\Backend\Redis::__construct` and `Phalcon\Cache\Backend\Redis::_connect` to correctly handle the Redis auth option [#12736](https://github.com/phalcon/cphalcon/issues/12736)
- Fixed `Phalcon\Mvc\Collection::getReservedAttributes`, added missing properties to reserved attributes [phalcon/incubator#762](https://github.com/phalcon/incubator/issues/762), [phalcon/incubator#760](https://github.com/phalcon/incubator/issues/760)
- Fixed `Phalcon\Mvc\Router\Annotation::processActionAnnotation` to support PATCH request
- Fixed `Phalcon\Assets\Manager::output`, implemented missing resource type filtering for mixed resource collections [#2408](https://github.com/phalcon/cphalcon/issues/2408)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be on 3.2.1 block.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right... sorry, fixed.

@ninjapanzer ninjapanzer force-pushed the pks/asset_manager_with_mixed_resource_collection branch from 52b3fa4 to 765d74b Compare June 21, 2017 12:17
@sergeyklay sergeyklay merged commit eecb216 into phalcon:3.2.x Jun 21, 2017
@sergeyklay
Copy link
Contributor

Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants