From b140da91a877de5907223305cfa774eb9dac4b58 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 24 Jan 2014 11:11:16 -0300 Subject: [PATCH] rails3: fix json ecape --- app/helpers/application_helper.rb | 6 +++--- config/initializers/json_escape.rb | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 config/initializers/json_escape.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c93e13d..a26170e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1070,7 +1070,7 @@ module ApplicationHelper end link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') + - link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger') + link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger') end alias :browse_contents_menu :search_contents_menu @@ -1086,7 +1086,7 @@ module ApplicationHelper end link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') + - link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger') + link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger') end alias :browse_people_menu :search_people_menu @@ -1102,7 +1102,7 @@ module ApplicationHelper end link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') + - link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger') + link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger') end alias :browse_communities_menu :search_communities_menu diff --git a/config/initializers/json_escape.rb b/config/initializers/json_escape.rb new file mode 100644 index 0000000..a9000ef --- /dev/null +++ b/config/initializers/json_escape.rb @@ -0,0 +1,9 @@ +class ActionView::Base + def json_escape(s) + #result = s.to_s.gsub('/', '\/') + result = CGI::escapeHTML(s) + s.html_safe? ? result.html_safe : result + end + + alias j json_escape +end -- libgit2 0.21.2