myg 2.3.2 → 2.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/app/views/mozaic/myg/_checkbox.html.erb +2 -2
  4. data/app/views/mozaic/myg/_form-field.html.erb +9 -9
  5. data/app/views/mozaic/myg/_radio.html.erb +2 -2
  6. data/app/views/mozaic/myg/_switch.html.erb +2 -2
  7. data/lib/myg/version.rb +1 -1
  8. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 659173bf49a85aa8f6809b99ee21ce2bb02d38f40ee3e8b5fd5adf99bd076c4e
4
- data.tar.gz: 5bdd0f771f0e3971dee5e85b618b4cdd4172f73d27e44b9a17a6f074f1766206
3
+ metadata.gz: 60c2ee718112a659c71183889dc1add9a38e37cf6b30643a1b7581e3806b1337
4
+ data.tar.gz: 10bdcb9da1ad4cdb1f7e1da91b0a8f819dd39662a47af0b2d91bdcc036c9bb54
5
5
  SHA512:
6
- metadata.gz: 289a5ca1fbfc822cbfd0e1dbe2c3fcb55c9a56c077ea281e61485587a00613abb7a45d08876c9e63e98878a3ee8501d911e27e9a7ed530afefd16cd6d7976c7d
7
- data.tar.gz: 14d4d2c69cd6df82a8bbde5590ced7e720bc4754309f9408660229478c386b2e771240669af122a44a0d0f5e34f8ab41fd61173380e05a341e69c2d3409fb1a7
6
+ metadata.gz: 3886130fdf1589a419576d59a6002f825d0f74650e4273961b0835295b739c62d38b5c9ec984251082b045f0214a768433c8db74662aca2be6b2a965e15a5ef3
7
+ data.tar.gz: 365d9649da06f8d35df608fb67dc0d5fc8c620b45a65d6ded5df7b007a5ed9b48efeb9a3d526c4801dbee22d5736fe8ab39ce42371b3a42a63ccac3dd3f673b0
data/CHANGELOG.md CHANGED
@@ -4,6 +4,11 @@
4
4
 
5
5
  * nothing yet
6
6
 
7
+ ### 2.3.3 - 2018/02/25
8
+
9
+ * bugfixes
10
+ * fixed `undefined method 'merge' for nil:NilClass`
11
+
7
12
  ### 2.3.2 - 2018/02/25
8
13
 
9
14
  * bugfixes
data/app/views/mozaic/myg/_checkbox.html.erb CHANGED
@@ -13,9 +13,9 @@
13
13
  id: id
14
14
  } %>
15
15
 
16
- <%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
16
+ <%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
17
17
  <input value="0" type="hidden" name="<%= name %>" />
18
- <%= tag 'input', options[:input_html].merge(input_html) %>
18
+ <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
19
19
  <div class="mdc-checkbox__background">
20
20
  <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
21
21
  <path class="mdc-checkbox__checkmark__path" fill="none" stroke="white" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
data/app/views/mozaic/myg/_form-field.html.erb CHANGED
@@ -17,29 +17,29 @@
17
17
  class: ['myg-label--wrapper', options.dig(:label_wrapper_html, :class)].join(' ')
18
18
  } %>
19
19
 
20
- <%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
20
+ <%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
21
21
  <% if options[:label] %>
22
22
  <% unless options[:label].is_a? Array %>
23
- <%= component 'myg/label', options[:label_html].merge(label_html) do %><%= options[:label].html_safe %><% end %>
23
+ <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:label].html_safe %><% end %>
24
24
  <% else %>
25
- <%= content_tag 'div', options[:label_wrapper_html].merge(label_wrapper_html) do %>
25
+ <%= content_tag 'div', (options[:label_wrapper_html] || {}).merge(label_wrapper_html) do %>
26
26
  <% options[:label].each_with_index do |label, index| %>
27
- <%= component 'myg/label', options[:label_html].merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
27
+ <%= component 'myg/label', (options[:label_html] || {}).merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
28
28
  <% end %>
29
29
  <% end %>
30
30
  <% end %>
31
31
  <% end %>
32
- <%= component "myg/#{options[:as]}", options[:input_html].merge(input_html) %>
32
+ <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
33
33
  <% if options[:inline_label] %>
34
34
  <% unless options[:inline_label].is_a? Array %>
35
- <%= component 'myg/label', options[:label_html].merge(label_html) do %><%= options[:inline_label] %><% end %>
35
+ <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:inline_label] %><% end %>
36
36
  <% else %>
37
- <%= content_tag 'div', options[:label_wrapper_html].merge(label_wrapper_html) do %>
37
+ <%= content_tag 'div', (options[:label_wrapper_html] || {}).merge(label_wrapper_html) do %>
38
38
  <% options[:inline_label].each_with_index do |label, index| %>
39
- <%= component 'myg/label', options[:label_html].merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
39
+ <%= component 'myg/label', (options[:label_html] || {}).merge((index == 0 ? label_html : label_secondary_html)) do %><%= label.html_safe %><% end %>
40
40
  <% end %>
41
41
  <% end %>
42
42
  <% end %>
43
43
  <% end %>
44
- <% if options[:floating_label] %><%= component 'myg/label', options[:label_html].merge(label_html) do %><%= options[:floating_label] %><% end %><% end %>
44
+ <% if options[:floating_label] %><%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:floating_label] %><% end %><% end %>
45
45
  <% end %>
data/app/views/mozaic/myg/_radio.html.erb CHANGED
@@ -14,8 +14,8 @@
14
14
  id: id
15
15
  } %>
16
16
 
17
- <%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
18
- <%= tag 'input', options[:input_html].merge(input_html) %>
17
+ <%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
18
+ <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
19
19
  <div class="mdc-radio__background">
20
20
  <div class="mdc-radio__outer-circle"></div>
21
21
  <div class="mdc-radio__inner-circle"></div>
data/app/views/mozaic/myg/_switch.html.erb CHANGED
@@ -12,8 +12,8 @@
12
12
  id: id
13
13
  } %>
14
14
 
15
- <%= content_tag 'div', options[:wrapper_html].merge(wrapper_html) do %>
16
- <%= tag 'input', options[:input_html].merge(input_html) %>
15
+ <%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
16
+ <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
17
17
  <div class="mdc-switch__background">
18
18
  <div class="mdc-switch__knob"></div>
19
19
  </div>
data/lib/myg/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Myg
2
2
 
3
- VERSION = '2.3.2'
3
+ VERSION = '2.3.3'
4
4
 
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: myg
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.2
4
+ version: 2.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Hübotter