Download as
Browse Code »

Commit fece552855eec6caad82ad8b1f0b723857b19502

Authored by Braulio Bhavamitra
1 parent 93116c6b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Encapsulate plugins' js code

Showing 2 changed files with 9 additions and 6 deletions   Show diff stats
app/helpers/layout_helper.rb
  Diff comments   View file @fece552
1 module LayoutHelper 1 module LayoutHelper
2 2
3 def noosfero_javascript 3 def noosfero_javascript
4 - render :file => 'layouts/_javascript' 4 + plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
  5 +
  6 + output = ''
  7 + output += render :file => 'layouts/_javascript'
  8 + output += javascript_tag 'render_all_jquery_ui_widgets()'
  9 + unless plugins_javascripts.empty?
  10 + output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
  11 + end
  12 + output
5 end 13 end
6 14
7 def noosfero_stylesheets 15 def noosfero_stylesheets
app/views/layouts/application-ng.rhtml
  Diff comments   View file @fece552
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
12 12
13 <%# Add custom tags/styles/etc via content_for %> 13 <%# Add custom tags/styles/etc via content_for %>
14 <%= yield :head %> 14 <%= yield :head %>
15 - <%= javascript_tag('render_all_jquery_ui_widgets()') %>  
16 - <%  
17 - plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten  
18 - %>  
19 - <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>  
20 <%= 15 <%=
21 @plugins.dispatch(:head_ending).collect do |content| 16 @plugins.dispatch(:head_ending).collect do |content|
22 content.respond_to?(:call) ? content.call : content 17 content.respond_to?(:call) ? content.call : content