Merge branch 'development' (small improvements)

README.md

@@ -170,31 +170,13 @@ Options can be passed from SimpleForm (from version 4.6.10 or later)
 
 The scripts below will be included when you use the "require pickers" (for version v4.0.0+) or "require bootstrap-datetimepicker/pickers" (for version v1.0.0). If you need different activation scripts, ignore the //= require pickers (for version v4.0.0+) or //= require bootstrap-datetimepicker/pickers (for version v1.0.0) line in app/assets/javascripts/application.js.
 
-Version 4.3.5+:
+Version 4.7.15+:
 
 ```javascript
-var default_picker_options = {
-  // put here your default options that should be applied for all pickers
-
-  // icons will be inserted if you run the generator with Font-Awesome parameter
-  icons: {
-    date: 'fa fa-calendar',
-    time: 'fa fa-clock-o',
-    up: 'fa fa-chevron-up',
-    down: 'fa fa-chevron-down',
-    previous: 'fa fa-chevron-left',
-    next: 'fa fa-chevron-right',
-    today: 'fa fa-crosshairs',
-    clear: 'fa fa-trash-o'
-  }
-}
-
 $(document).on('ready page:change', function() {
-  $('.datetimepicker').datetimepicker(default_picker_options);
-
-  $('.timepicker').datetimepicker(default_picker_options);
-
-  $('.datepicker').datetimepicker(default_picker_options);
+  $('.datetimepicker').datetimepicker({
+    // put here your custom picker options, that should be applied for all pickers
+  });
 
   $('.datetimerange').each(function(){
     var $this = $(this)
@@ -267,8 +249,10 @@ The default values of the options:
         widgetParent: null,
         ignoreReadonly: false,
         keepOpen: false,
+        focusOnShow: true,
         inline: false,
         keepInvalid: false,
+        datepickerInput: '.datepickerinput'
 ```
 For more details, please refer to Bootstrap 3 Datepicker v4 Docs site:
   - [for public API documentation](http://eonasdan.github.io/bootstrap-datetimepicker/#bootstrap-3-datepicker-v4-docs)

lib/generators/datetimepicker_rails/install_generator.rb

@@ -62,16 +62,11 @@ def create_pickers_js
         icons = icon_family == 'Glyphicon' ? '' : get_icons
 
         vendor 'assets/javascripts/pickers.js' do <<-FILE
-var default_picker_options = {
-#{icons}
-}
-
 $(document).on('ready page:change', function() {
-  $('.datetimepicker').datetimepicker(default_picker_options);
-
-  $('.timepicker').datetimepicker(default_picker_options);
-
-  $('.datepicker').datetimepicker(default_picker_options);
+  $('.datetimepicker').datetimepicker({
+    // put here your custom picker options, that should be applied for all pickers
+#{icons}
+  });
 
   $('.datetimerange').each(function(){
     var $this = $(this)
@@ -143,7 +138,7 @@ def get_icons
         icons += "      today: \'#{options[:custom_icons][:today]}\',\n"
         icons += "      clear: \'#{options[:custom_icons][:clear]}\',\n"
         icons += "      close: \'#{options[:custom_icons][:close]}\'\n"
-        icons += "    }\n"
+        icons += "    }"
       end
 
     end

lib/generators/templates/inputs/date_picker_input.rb

@@ -3,7 +3,7 @@ def input(wrapper_options)
     set_html_options
     set_value_html_option
 
-    template.content_tag :div, class: 'input-group date datepicker' do
+    template.content_tag :div, class: 'input-group date datetimepicker' do
       input = super(wrapper_options) # leave StringInput do the real rendering
       input + input_button
     end