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.

Sign up for GitHub

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

Jump to bottom

Adding the ability to inline CSS and Js code via Asset Manager #1377

Merged
merged 2 commits into from
Apr 4, 2017
Merged

Adding the ability to inline CSS and Js code via Asset Manager #1377

merged 2 commits into from
Apr 4, 2017

Commits on Mar 23, 2017

  1. Add {'loading': 'inline'} option for Js and CSS assets 

    * Assets.php: Extract common functionaly of addCss() and addJs() into
  addTo(), make css() and js() honor $attributes['loading'],
  make pipelineCss() and pipelineJs() return generated content
  instead of URL depending on new option $returnURL.

* AssetsTest.php: Accept new 'loading' option for CSS, add tests for
  adding and pipelining local and remote assets with inline loading.
    @OliverO2
    OliverO2 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    985253b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into develop

    @OliverO2
    OliverO2 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    76fa885 View commit details
    Browse the repository at this point in the history