Remove overrides that inserts a non-breaking space (nbsp) to empty option elements...

Patch by Go MAEDA (maeda).

git-svn-id: https://svn.redmine.org/redmine/trunk@22701 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 1d932eb1f74cf02140b14aedcf97cfecdac6cd95..20d442add8849f290aa42332b2e438ab6479eb8e 100644 (file)
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -34,20 +34,8 @@ end
 
 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
 
-# HTML5: <option value=""></option> is invalid, use <option value="">&nbsp;</option> instead
 module ActionView
   module Helpers
-    module Tags
-      SelectRenderer.prepend(Module.new do
-        def add_options(option_tags, options, value = nil)
-          if options.delete(:include_blank)
-            options[:prompt] = '&nbsp;'.html_safe
-          end
-          super
-        end
-      end)
-    end
-
     module FormHelper
       alias :date_field_without_max :date_field
       def date_field(object_name, method, options = {})
@@ -56,29 +44,11 @@ module ActionView
     end
 
     module FormTagHelper
-      alias :select_tag_without_non_empty_blank_option :select_tag
-      def select_tag(name, option_tags = nil, options = {})
-        if options.delete(:include_blank)
-          options[:prompt] = '&nbsp;'.html_safe
-        end
-        select_tag_without_non_empty_blank_option(name, option_tags, options)
-      end
-
       alias :date_field_tag_without_max :date_field_tag
       def date_field_tag(name, value = nil, options = {})
         date_field_tag_without_max(name, value, options.reverse_merge(max: '9999-12-31'))
       end
     end
-
-    module FormOptionsHelper
-      alias :options_for_select_without_non_empty_blank_option :options_for_select
-      def options_for_select(container, selected = nil)
-        if container.is_a?(Array)
-          container = container.map {|element| element.presence || ["&nbsp;".html_safe, ""]}
-        end
-        options_for_select_without_non_empty_blank_option(container, selected)
-      end
-    end
   end
 end
 

diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
index 57f1aff904d0a8e5ee81257a6469ee3cd9f3ebba..5a2289ff707a58942fad6ba99f843cc8cedc06e8 100644 (file)
--- a/test/functional/boards_controller_test.rb
+++ b/test/functional/boards_controller_test.rb
@@ -177,10 +177,6 @@ class BoardsControllerTest < Redmine::ControllerTest
       assert_select 'option[value=""]'
       assert_select 'option[value="1"]', :text => 'Help'
     end
-
-    # &nbsp; replaced by nokogiri, not easy to test in DOM assertions
-    assert_not_include '<option value=""></option>', response.body
-    assert_include '<option value="">&nbsp;</option>', response.body
   end
 
   def test_new_without_project_boards