diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index abcaa4b..17c33d7 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -1,7 +1,15 @@ module LayoutHelper def noosfero_javascript - render :file => 'layouts/_javascript' + plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten + + output = '' + output += render :file => 'layouts/_javascript' + output += javascript_tag 'render_all_jquery_ui_widgets()' + unless plugins_javascripts.empty? + output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}" + end + output end def noosfero_stylesheets diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml index adc041d..69174b0 100644 --- a/app/views/layouts/application-ng.rhtml +++ b/app/views/layouts/application-ng.rhtml @@ -12,11 +12,6 @@ <%# Add custom tags/styles/etc via content_for %> <%= yield :head %> - <%= javascript_tag('render_all_jquery_ui_widgets()') %> - <% - plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten - %> - <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %> <%= @plugins.dispatch(:head_ending).collect do |content| content.respond_to?(:call) ? content.call : content -- libgit2 0.21.2