Merge remote-tracking branch 'origin/development'

zpaulovics · Jun 2, 2015 · 36d21ce · 36d21ce
2 parents c5405f3 + 7451e15
commit 36d21ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/datetimepicker-rails/version.rb b/lib/datetimepicker-rails/version.rb
@@ -1,5 +1,5 @@
 module Datetimepicker
   module Rails
-    VERSION = "4.7.15"
+    VERSION = "4.7.16"
   end
 end
diff --git a/lib/generators/templates/inputs/date_picker_input.rb b/lib/generators/templates/inputs/date_picker_input.rb
@@ -53,12 +53,14 @@ def date_view_header_format
   def date_options_base
     {
         locale: I18n.locale.to_s,
-        format: picker_pattern
+        format: picker_pattern,
+        dayViewHeaderFormat: date_view_header_format
     }
   end
 
   def date_options
-    date_options_base.merge!({dayViewHeaderFormat: date_view_header_format})
+    custom_options = input_html_options[:data][:date_options] || {}
+    date_options_base.merge!(custom_options)
   end
 
 end