Commit 18bda87e8783fd80cc0ceddaa06b741a8aee5862

Authored by Braulio Bhavamitra
1 parent 88e6388f

responsive: fix missed conflicts

plugins/responsive/lib/ext/boxes_helper.rb
@@ -62,16 +62,7 @@ module BoxesHelper @@ -62,16 +62,7 @@ module BoxesHelper
62 end 62 end
63 63
64 include ResponsiveChecks 64 include ResponsiveChecks
65 -<<<<<<< HEAD  
66 - if RUBY_VERSION >= '2.0.0'  
67 - prepend ResponsiveMethods  
68 - else  
69 - extend ActiveSupport::Concern  
70 - included { include ResponsiveMethods }  
71 - end  
72 -=======  
73 prepend ResponsiveMethods 65 prepend ResponsiveMethods
74 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
75 66
76 end 67 end
77 68
plugins/responsive/lib/ext/forms_helper.rb
@@ -11,10 +11,6 @@ module FormsHelper @@ -11,10 +11,6 @@ module FormsHelper
11 return super unless theme_responsive? 11 return super unless theme_responsive?
12 12
13 options[:id] ||= 'radio-' + FormsHelper.next_id_number 13 options[:id] ||= 'radio-' + FormsHelper.next_id_number
14 -<<<<<<< HEAD  
15 - content_tag( 'label', radio_button_tag( name, value, checked, options ) + ' ' +  
16 - human_name, for: options[:id], class: 'radio-inline' )  
17 -=======  
18 content_tag :div, class:'radio-inline' do 14 content_tag :div, class:'radio-inline' do
19 content_tag :label, for: options[:id] do 15 content_tag :label, for: options[:id] do
20 [ 16 [
@@ -24,7 +20,6 @@ module FormsHelper @@ -24,7 +20,6 @@ module FormsHelper
24 ].safe_join 20 ].safe_join
25 end 21 end
26 end 22 end
27 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
28 end 23 end
29 24
30 # add -inline class 25 # add -inline class
@@ -32,10 +27,6 @@ module FormsHelper @@ -32,10 +27,6 @@ module FormsHelper
32 return super unless theme_responsive? 27 return super unless theme_responsive?
33 28
34 options[:id] ||= 'checkbox-' + FormsHelper.next_id_number 29 options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
35 -<<<<<<< HEAD  
36 - hidden_field_tag(name, '0') +  
37 - content_tag( 'label', check_box_tag( name, value, checked, options ) + ' ' + human_name, for: options[:id], class: 'checkbox-inline')  
38 -=======  
39 [ 30 [
40 hidden_field_tag(name, '0'), 31 hidden_field_tag(name, '0'),
41 content_tag(:div, class:'checkbox-inline') do 32 content_tag(:div, class:'checkbox-inline') do
@@ -48,7 +39,6 @@ module FormsHelper @@ -48,7 +39,6 @@ module FormsHelper
48 end 39 end
49 end 40 end
50 ].safe_join 41 ].safe_join
51 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
52 end 42 end
53 43
54 def submit_button(type, label, html_options = {}) 44 def submit_button(type, label, html_options = {})
@@ -69,29 +59,13 @@ module FormsHelper @@ -69,29 +59,13 @@ module FormsHelper
69 59
70 html_options.delete(:cancel) 60 html_options.delete(:cancel)
71 bt_submit = button_tag(label, html_options.merge(class: the_class)) 61 bt_submit = button_tag(label, html_options.merge(class: the_class))
72 -<<<<<<< HEAD  
73 -=======  
74 62
75 [bt_submit + bt_cancel].safe_join 63 [bt_submit + bt_cancel].safe_join
76 end 64 end
77 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
78 65
79 bt_submit + bt_cancel 66 bt_submit + bt_cancel
80 end 67 end
81 68
82 -<<<<<<< HEAD  
83 - %w[select select_tag text_field_tag number_field_tag password_field_tag].each do |method|  
84 - define_method method do |*args, &block|  
85 - #return super(*args, &block) unless theme_responsive?  
86 -  
87 - options = args.extract_options!  
88 - if options['class']  
89 - options['class'] = "#{options['class']} form-control"  
90 - else  
91 - options[:class] = "#{options[:class]} form-control"  
92 - end  
93 - super(*(args << options), &block)  
94 -=======  
95 %w[ 69 %w[
96 select_tag 70 select_tag
97 text_field_tag text_area_tag 71 text_field_tag text_area_tag
@@ -101,22 +75,12 @@ module FormsHelper @@ -101,22 +75,12 @@ module FormsHelper
101 define_method method do |name, value=nil, options={}, &block| 75 define_method method do |name, value=nil, options={}, &block|
102 responsive_add_field_class! options 76 responsive_add_field_class! options
103 super(name, value, options, &block).html_safe 77 super(name, value, options, &block).html_safe
104 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
105 end 78 end
106 end 79 end
107 %w[select_month select_year].each do |method| 80 %w[select_month select_year].each do |method|
108 define_method method do |date, options={}, html_options={}| 81 define_method method do |date, options={}, html_options={}|
109 -<<<<<<< HEAD  
110 - if html_options['class']  
111 - html_options['class'] = "#{html_options['class']} form-control"  
112 - else  
113 - html_options[:class] = "#{html_options[:class]} form-control"  
114 - end  
115 - super date, options, html_options  
116 -=======  
117 responsive_add_field_class! html_options 82 responsive_add_field_class! html_options
118 super(date, options, html_options).html_safe 83 super(date, options, html_options).html_safe
119 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
120 end 84 end
121 end 85 end
122 86
plugins/responsive/lib/ext/input_helper.rb
@@ -4,29 +4,15 @@ module InputHelper @@ -4,29 +4,15 @@ module InputHelper
4 protected 4 protected
5 5
6 def input_group_addon addon, options = {}, &block 6 def input_group_addon addon, options = {}, &block
7 -<<<<<<< HEAD  
8 - content_tag :div,  
9 - content_tag(:span, addon, class: 'input-group-addon') + yield,  
10 - class: 'input-group'  
11 -=======  
12 content_tag :div, class: 'input-group' do 7 content_tag :div, class: 'input-group' do
13 [ 8 [
14 content_tag(:span, addon, class: 'input-group-addon'), 9 content_tag(:span, addon, class: 'input-group-addon'),
15 capture(&block), 10 capture(&block),
16 ].safe_join 11 ].safe_join
17 end 12 end
18 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
19 end 13 end
20 14
21 end 15 end
22 16
23 -<<<<<<< HEAD  
24 -module ApplicationHelper  
25 -  
26 - include InputHelper  
27 -  
28 -end  
29 -=======  
30 ApplicationHelper.include InputHelper 17 ApplicationHelper.include InputHelper
31 ->>>>>>> 2ef3a43... responsive: fix html_safe issues  
32 18