simple_form-bootstrap 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f4677d60eb55516edfce94662be7be2694a9b0
-  data.tar.gz: 5c486b494860f4460812723074f387019713ab2a
+  metadata.gz: 082783c879caed348075aecb058899a107a06adf
+  data.tar.gz: 194227835e71f4be5627a1ed5ab624cb7090885d
 SHA512:
-  metadata.gz: eac1e6ee3e50a2b2f8d580c1f915f3b3b92d8da2ba09f92122f314c374562c30d7e00297e7ab01671bad49cd9ef15c22207dd8b7858473c2dd91f4d06950ca89
-  data.tar.gz: 468837005159acccbe5e73ce8bac474432e3511cf7dddf3af9fcb8f53d03a14d66c86dd561e9a291fc3a17d4b8008fb3346a6e126c7d5040cafaf39d05bc6e9e
+  metadata.gz: c760ed407a6188f2d6d28c94f9611252cfda09bc462733625097583a0b10dc497b393cc5ba8afd1333ec6ea1b86980c535daffb3713181f6ab73cc7eb5429e65
+  data.tar.gz: d435e851205f2862ac558fa1bf6a1086d16c92cc50523ab803c6c5ea054bbb84888b74d68b514533d58aebce5556c5b29839ad2c9159d49162b4904c46472203

data/app/assets/javascripts/simple_form-bootstrap.js

@@ -6,11 +6,15 @@
     // Enable our date/time pickers
     var datePickers = $('input.bootstrap-datepicker', node);
     datePickers.datetimepicker();
+
+    // Enable our styled Bootstrap select controls, except Twitter Typeahead controls.
+    var selects = $('select.form-control:not(.typeahead)', node);
+    selects.selectpicker();
   }
 
   $(document).on('ready', function(e) {
     initializeComponents(document);
-  })
+  });
   $(document).on('DOMNodeInserted', function(e) {
     initializeComponents(e.target);
   });

data/app/assets/javascripts/simple_form-bootstrap/select_input.js

@@ -0,0 +1,12 @@
+// Hijacks the default Bootstrap date-time picker to always format dates in the specified format
+// through the use of a hidden field.
+(function($) {
+  'use strict';
+  if ($.fn.selectpicker) {
+    return;
+  }
+
+  $.fn.selectpicker = function(arg) {
+    return methods.initialise.call(this, arg);
+  };
+}(jQuery));

data/lib/simple_form/bootstrap/form_builders/button.rb

@@ -0,0 +1,25 @@
+module SimpleForm::Bootstrap::FormBuilders::Button
+  # Adds the btn-default class selectively to buttons which do not have an explicit button type.
+  def button_with_bootstrap(type, *args, &proc)
+    options = args.extract_options!.dup
+    options[:class] = [*options[:class]]
+
+    # Add the specified class type.
+    if options[:class].select { |cls| cls.length < 4 || cls[0, 4] == 'btn-' }.empty?
+      if type.to_s == :submit.to_s.freeze
+        options[:class] << 'btn-primary'
+      else
+        options[:class] << 'btn-default'
+      end
+    end
+    args << options
+
+    button_without_bootstrap(type, *args, &proc)
+  end
+end
+
+SimpleForm::FormBuilder.class_eval do
+  include SimpleForm::Bootstrap::FormBuilders::Button
+
+  alias_method_chain :button, :bootstrap
+end

data/lib/simple_form/bootstrap/setup.rb

@@ -10,7 +10,7 @@ module SimpleForm::Bootstrap::Setup
   def configure_simple_form
     SimpleForm.setup do |config|
       config.error_notification_class = 'alert alert-danger'
-      config.button_class = 'btn btn-default'
+      config.button_class = 'btn'
       config.boolean_label_class = nil
 
       config.wrappers :vertical_form, tag: 'div', class: 'form-group',

data/lib/simple_form/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module SimpleForm; end
 module SimpleForm::Bootstrap
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form-bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Joel Low
@@ -76,9 +76,11 @@ files:
 - Rakefile
 - app/assets/javascripts/simple_form-bootstrap.js
 - app/assets/javascripts/simple_form-bootstrap/date_time_input.js
+- app/assets/javascripts/simple_form-bootstrap/select_input.js
 - lib/simple_form/bootstrap.rb
 - lib/simple_form/bootstrap/engine.rb
 - lib/simple_form/bootstrap/form_builders.rb
+- lib/simple_form/bootstrap/form_builders/button.rb
 - lib/simple_form/bootstrap/form_builders/date_time.rb
 - lib/simple_form/bootstrap/inputs.rb
 - lib/simple_form/bootstrap/inputs/date_time_input.rb