diff --git a/changelog.md b/changelog.md index 84e5b64a0a..910e9cd6c4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ ## 2.1.0 [unreleased] +* Removed :before_javascript_libraries, :after_javascript_libraries, and :javascript_libraries content blocks. [#1842](https://github.com/resolve/refinerycms/pull/1842). [Rob Yurkowski](https://github.com/robyurkowski) * Refactored wysiwyg fields into a partial. [#1796](https://github.com/resolve/refinerycms/pull/1796). [Rob Yurkowski](https://github.com/robyurkowski) * Shortened all authentication helpers. [#1719](https://github.com/resolve/refinerycms/pull/1719). [Ryan Bigg](https://github.com/radar) * Added canonical page id to body to allow CSS selectors to target specific pages instead of including special CSS files. [#1700](https://github.com/resolve/refinerycms/pull/1700) & [#1828](https://github.com/resolve/refinerycms/pull/1828). [Philip Arndy](https://github.com/parndt) & [Graham Wagener](https://github.com/gwagener/) diff --git a/core/app/views/refinery/_javascripts.html.erb b/core/app/views/refinery/_javascripts.html.erb index 66161e481d..bce9263aa4 100644 --- a/core/app/views/refinery/_javascripts.html.erb +++ b/core/app/views/refinery/_javascripts.html.erb @@ -1,11 +1,8 @@ -<%= yield :before_javascript_libraries -%> -<%= yield :javascript_libraries %> -<%= yield :after_javascript_libraries %> +<%= javascript_include_tag 'application' %> +<%= yield :javascripts -%> <% if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %> <% end %> -<%= javascript_include_tag 'application' %> -<%= yield :javascripts -%>