Skip to content

Commit

Permalink
Remove extra javascript content blocks.
Browse files Browse the repository at this point in the history
  • Loading branch information
robyurkowski committed Jul 29, 2012
1 parent 58e24df commit 84581b6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -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/)
Expand Down
7 changes: 2 additions & 5 deletions core/app/views/refinery/_javascripts.html.erb
Original file line number Diff line number Diff line change
@@ -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/ %>
<!--[if lt IE 7 ]>
<%= javascript_include_tag 'dd_belatedpng' %>
<script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
<![endif]-->
<% end %>
<%= javascript_include_tag 'application' %>
<%= yield :javascripts -%>

0 comments on commit 84581b6

Please sign in to comment.